From b4516396fecbc555eed7bb04605dd648fba6dc3c Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Wed, 23 Feb 2022 14:56:16 +0100 Subject: [PATCH 1/2] SPE-1202 - Fixed project name after loading a 3mf file whose path contains diacritics by double clicking --- src/slic3r/GUI/GUI_App.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index b914d8db47..e2658dfe03 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -754,7 +754,7 @@ void GUI_App::post_init() if (boost::algorithm::iends_with(filename, ".amf") || boost::algorithm::iends_with(filename, ".amf.xml") || boost::algorithm::iends_with(filename, ".3mf")) - this->plater()->set_project_filename(filename); + this->plater()->set_project_filename(from_u8(filename)); } } if (! this->init_params->extra_config.empty()) From b155d1a2c3fcaa7273e94c8d9db1cb72855ccf36 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Wed, 23 Feb 2022 15:40:25 +0100 Subject: [PATCH 2/2] Follow-up of 1eac357739d44fcdcfbbb742b888b51ce8858bba - Fixed color of volumes after creation --- src/slic3r/GUI/3DScene.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index da09a236f4..2405f39bca 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -771,15 +771,14 @@ int GLVolumeCollection::load_object_volume( const TriangleMesh &mesh = model_volume->mesh(); this->volumes.emplace_back(new GLVolume()); GLVolume& v = *this->volumes.back(); + v.set_color(color_from_model_volume(*model_volume)); #if ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL #if ENABLE_SMOOTH_NORMALS v.model.init_from(mesh, true); #else v.model.init_from(mesh); #endif // ENABLE_SMOOTH_NORMALS - v.model.set_color(color_from_model_volume(*model_volume)); #else - v.set_color(color_from_model_volume(*model_volume)); #if ENABLE_SMOOTH_NORMALS v.indexed_vertex_array.load_mesh(mesh, true); #else @@ -1113,8 +1112,7 @@ void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, bool disab glcheck(); #if ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - if (volume.first->model.is_initialized()) - volume.first->model.set_color(volume.first->render_color); + volume.first->model.set_color(volume.first->render_color); #endif // ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL volume.first->render();