diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index 39d2a2e40ba..8d52c5978c9 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -914,17 +914,8 @@ void GLVolume::render_mmu_texture_preview(const Transform3d &view_matrix, return preview_colors; }; - const bool original_mesh_preview_can_defer_source_texture = - use_original_mesh_texture_preview && - texture_preview_simulation_enabled_for_filament(base_filament_id, num_physical, texture_mgr); - const bool mmuseg_preview_can_defer_source_texture = - !use_original_mesh_texture_preview && - !mmuseg_texture_preview_models.empty() && - texture_preview_simulation_enabled_for_all_filaments(mmuseg_texture_preview_filament_ids, num_physical, texture_mgr); if ((use_original_mesh_texture_preview || !mmuseg_texture_preview_models.empty()) && - (original_mesh_preview_can_defer_source_texture || - mmuseg_preview_can_defer_source_texture || - ensure_model_volume_texture_preview(*model_volume, mmuseg_texture_preview, mmuseg_texture_preview_signature))) { + ensure_model_volume_texture_preview(*model_volume, mmuseg_texture_preview, mmuseg_texture_preview_signature)) { if (use_original_mesh_texture_preview) { const int extruder_id = model_volume->extruder_id(); const ColorRGBA fallback_color = extruder_colors.empty() ? ColorRGBA(0.15f, 0.65f, 0.6f, 1.f) : extruder_colors.front(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp index 9cf65dca683..c7c7957616b 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp @@ -1869,12 +1869,8 @@ void TriangleSelectorPatch::render_texture_preview(const Transform3d& m return preview_colors; }; - const bool texture_preview_can_defer_source_texture = - !m_texture_preview_models.empty() && - texture_preview_simulation_enabled_for_all_filaments(m_texture_preview_filament_ids, num_physical, texture_mgr); if (!m_texture_preview_models.empty() && - (texture_preview_can_defer_source_texture || - ensure_model_volume_texture_preview(*m_model_volume, m_texture_preview, m_texture_preview_signature))) { + ensure_model_volume_texture_preview(*m_model_volume, m_texture_preview, m_texture_preview_signature)) { render_model_texture_preview_models(m_texture_preview_models, adjusted_preview_colors(m_texture_preview_colors), m_texture_preview_filament_ids, diff --git a/src/slic3r/GUI/MMUPaintedTexturePreview.cpp b/src/slic3r/GUI/MMUPaintedTexturePreview.cpp index 7601a23ceaf..4272fd5497d 100644 --- a/src/slic3r/GUI/MMUPaintedTexturePreview.cpp +++ b/src/slic3r/GUI/MMUPaintedTexturePreview.cpp @@ -3266,7 +3266,12 @@ bool build_mmu_vertex_color_preview_models( *simulation_settings, model, preview_override, - preview_owner_key)) + preview_owner_key) && + !build_texture_mapping_color_preview_model_for_state(model_volume, + triangles_per_type[state_id], + nullptr, + model, + preview_override)) continue; } else { if (!build_texture_mapping_color_preview_model_for_state(model_volume, @@ -3283,7 +3288,8 @@ bool build_mmu_vertex_color_preview_models( filament_id, *simulation_settings, preview_owner_key, - model)) + model) && + !build_vertex_color_preview_model_for_state(model_volume, triangles_per_type[state_id], nullptr, model)) continue; } else { if (!build_vertex_color_preview_model_for_state(model_volume, triangles_per_type[state_id], nullptr, model))