mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: rendering: fix the assert under debug mode 

when using shared index object
we don't need to load mesh again

Change-Id: I085a7afc8c40508050ab523f43c76ecbdf8d6372
This commit is contained in:
lane.wei 2024-01-30 14:32:09 +08:00 committed by Lane.Wei
parent 3cee03b6f1
commit 745719c6cc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1094,6 +1094,7 @@ int GLVolumeCollection::load_object_volume(
const TriangleMesh* mesh_ptr = model_volume->mesh_ptr();
new_volume->ori_mesh = mesh_ptr;
std::map<const TriangleMesh*, std::set<GLVolume*>>::iterator iter = g_mesh_volumes_map.find(mesh_ptr);
bool need_create_mesh = true;
if (iter != g_mesh_volumes_map.end()) {
std::set<GLVolume*> & volume_set = iter->second;
@ -1103,6 +1104,7 @@ int GLVolumeCollection::load_object_volume(
else {
GLVolume* first_volume = *(volume_set.begin());
new_volume->indexed_vertex_array = first_volume->indexed_vertex_array;
need_create_mesh = false;
}
volume_set.emplace(new_volume);
}
@ -1113,12 +1115,14 @@ int GLVolumeCollection::load_object_volume(
volume_set.emplace(new_volume);
g_mesh_volumes_map.emplace(mesh_ptr, std::move(volume_set));
}
if (need_create_mesh) {
#if ENABLE_SMOOTH_NORMALS
v.indexed_vertex_array->load_mesh(mesh, true);
v.indexed_vertex_array->load_mesh(mesh, true);
#else
v.indexed_vertex_array->load_mesh(mesh);
v.indexed_vertex_array->load_mesh(mesh);
#endif // ENABLE_SMOOTH_NORMALS
v.indexed_vertex_array->finalize_geometry(opengl_initialized);
v.indexed_vertex_array->finalize_geometry(opengl_initialized);
}
v.composite_id = GLVolume::CompositeID(obj_idx, volume_idx, instance_idx);
if (model_volume->is_model_part())
{