GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 05:15:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fs_mouse

Browse Source
This commit is contained in:
Filip Sykala 2022-02-23 16:25:44 +01:00
commit 3cd15ac005
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/3DScene.cpp
View File

@ -771,15 +771,14 @@ int GLVolumeCollection::load_object_volume(
const TriangleMesh &mesh = model_volume->mesh(); const TriangleMesh &mesh = model_volume->mesh();
this->volumes.emplace_back(new GLVolume()); this->volumes.emplace_back(new GLVolume());
GLVolume& v = *this->volumes.back(); GLVolume& v = *this->volumes.back();
v.set_color(color_from_model_volume(*model_volume));
#if ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL #if ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL
#if ENABLE_SMOOTH_NORMALS #if ENABLE_SMOOTH_NORMALS
v.model.init_from(mesh, true); v.model.init_from(mesh, true);
#else #else
v.model.init_from(mesh); v.model.init_from(mesh);
#endif // ENABLE_SMOOTH_NORMALS #endif // ENABLE_SMOOTH_NORMALS
v.model.set_color(color_from_model_volume(*model_volume));
#else #else
v.set_color(color_from_model_volume(*model_volume));
#if ENABLE_SMOOTH_NORMALS #if ENABLE_SMOOTH_NORMALS
v.indexed_vertex_array.load_mesh(mesh, true); v.indexed_vertex_array.load_mesh(mesh, true);
#else #else
@ -1113,8 +1112,7 @@ void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, bool disab
glcheck(); glcheck();
#if ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL #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 #endif // ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL
volume.first->render(); volume.first->render();

2
src/slic3r/GUI/GUI_App.cpp
View File

@ -754,7 +754,7 @@ void GUI_App::post_init()
if (boost::algorithm::iends_with(filename, ".amf") || if (boost::algorithm::iends_with(filename, ".amf") ||
boost::algorithm::iends_with(filename, ".amf.xml") || boost::algorithm::iends_with(filename, ".amf.xml") ||
boost::algorithm::iends_with(filename, ".3mf")) 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()) if (! this->init_params->extra_config.empty())