juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: wrong flush logic

Browse Source 
1.Fix flush calc logic
2.Rename m_extruder in GCodeWriter

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I38f023fbad983305632ca62cbfb3909759013c25
(cherry picked from commit f1b0805ed13eb94d6eb61e12330db3d628c0241b)
This commit is contained in:
xun.zhang
2024-07-10 15:54:27 +08:00
committed by Noisyfox
parent 0ad75a223b
commit aee14d307a
11 changed files with 150 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/FilamentGroup.cpp
View File

@@ -36,7 +36,7 @@ namespace Slic3r
return count;
};
uint64_t max_group_num = (1 << m_filament_num);
uint64_t max_group_num = static_cast<uint64_t>(1 << m_filament_num);
int best_cost = std::numeric_limits<int>::max();
std::vector<int>best_label;
@@ -46,7 +46,7 @@ namespace Slic3r
continue;
std::set<int>group_0, group_1;
for (int j = 0; j < m_filament_num; ++j) {
if (i & (1 << j))
if (i & static_cast<uint64_t>(1 << j))
group_1.insert(m_used_filaments[j]);
else
group_0.insert(m_used_filaments[j]);