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

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates

Browse Source
This commit is contained in:
enricoturri1966 2022-02-23 15:41:23 +01:00
commit 8ae6ccff08
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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,7 +1112,6 @@ 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();