Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_opengl_es_rebase

This commit is contained in:
enricoturri1966 2022-07-21 10:10:22 +02:00
commit 182a4e06dc

View File

@ -3197,7 +3197,7 @@ bool load_3mf(const char* path, DynamicPrintConfig& config, ConfigSubstitutionCo
// All import should use "C" locales for number formatting. // All import should use "C" locales for number formatting.
CNumericLocalesSetter locales_setter; CNumericLocalesSetter locales_setter;
_3MF_Importer importer; _3MF_Importer importer;
bool res = importer.load_model_from_file(path, *model, config, config_substitutions, check_version); importer.load_model_from_file(path, *model, config, config_substitutions, check_version);
importer.log_errors(); importer.log_errors();
handle_legacy_project_loaded(importer.version(), config); handle_legacy_project_loaded(importer.version(), config);