Merge branch 'master' into dev

This commit is contained in:
Lukas Matena 2019-09-04 15:50:18 +02:00
commit 570bec299f
20 changed files with 1033 additions and 1093 deletions

View file

@ -545,6 +545,9 @@ void TabSLAMaterial::init_options_list()
void Tab::get_sys_and_mod_flags(const std::string& opt_key, bool& sys_page, bool& modified_page)
{
auto opt = m_options_list.find(opt_key);
if (opt == m_options_list.end())
return;
if (sys_page) sys_page = (opt->second & osSystemValue) != 0;
modified_page |= (opt->second & osInitValue) == 0;
}