juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-29 12:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update color mixing branch (#15242)

Browse Source
This commit is contained in:
Ian Bassi
2026-08-13 14:50:57 -03:00
committed by GitHub
parent e9d421050e d322b1a156
commit 2f66c536ca
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/PresetBundle.cpp
View File

@@ -5378,7 +5378,7 @@ void PresetBundle::update_multi_material_filament_presets(size_t to_delete_filam
f_multiplier.resize(nozzle_nums, 1.f); f_multiplier.resize(nozzle_nums, 1.f);
} }
if ( (num_filaments * num_filaments) != size_t(old_matrix.size() / old_nozzle_nums) ) { if (old_matrix.size() != num_filaments * num_filaments * nozzle_nums) {
// First verify if purging volumes presets for each extruder matches number of extruders // First verify if purging volumes presets for each extruder matches number of extruders
std::vector<double>& filaments = this->project_config.option<ConfigOptionFloats>("flush_volumes_vector")->values; std::vector<double>& filaments = this->project_config.option<ConfigOptionFloats>("flush_volumes_vector")->values;
while (filaments.size() < 2* num_filaments) { while (filaments.size() < 2* num_filaments) {

8
src/libslic3r/PrintApply.cpp
View File

@@ -559,9 +559,11 @@ static inline bool model_volume_solid_or_modifier(const ModelVolume &mv)
static inline Transform3f trafo_for_bbox(const Transform3d &object_trafo, const Transform3d &volume_trafo) static inline Transform3f trafo_for_bbox(const Transform3d &object_trafo, const Transform3d &volume_trafo)
{ {
Transform3d m = object_trafo * volume_trafo; // Orca: Keep the volume's local XY offset for multipart overlap checks, but remove the object's bed placement.
m.translation().x() = 0.; Transform3d object_trafo_local = object_trafo;
m.translation().y() = 0.; object_trafo_local.translation().x() = 0.;
object_trafo_local.translation().y() = 0.;
Transform3d m = object_trafo_local * volume_trafo;
return m.cast<float>(); return m.cast<float>();
} }