Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub master to 1.10.1 #5285

Merged
merged 27 commits into from
Nov 15, 2024
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
92a9b0e
ENH:modify the button text for cancel print
walterwongbbl Nov 13, 2024
9bb7880
FIX:fixed the issue of the hot bed temperature not updating
walterwongbbl Nov 13, 2024
210eda9
FIX:STEP mesh crashes in specific language
MackBambu Nov 13, 2024
61ed685
FIX:add "split mesh and save relationship" api
Haidiye00 Nov 13, 2024
fdcec63
ENH: adjust scarf seam angle check threshold
QingZhangBambu Nov 13, 2024
390bb32
ci: update build version to 01.10.00.90
Nov 13, 2024
91db671
FIX:m_last_linear and m_last_angle add init value
MackBambu Nov 13, 2024
5322da3
FIX: not use scarf seam as defualt
QingZhangBambu Nov 14, 2024
f173e7f
ci: update build version to 01.10.00.91
Nov 14, 2024
76e28e6
ENH:Update button text
walterwongbbl Nov 14, 2024
55edb69
FIX:add "enable_opengl_multi_instance" option
Haidiye00 Nov 14, 2024
dc2282c
FIX:use ui_and_3d_volume_map to change filament
Haidiye00 Nov 13, 2024
bda343a
ci: update build version to 01.10.00.92
Nov 14, 2024
92b90c7
FIX:delete app_config in GLShadersManager.cpp
Haidiye00 Nov 14, 2024
a63e276
ENH:translate text
Haidiye00 Nov 14, 2024
06f7acf
ENH:update step mesh ui
MackBambu Nov 14, 2024
f109395
ENH:translate step mesh text
MackBambu Nov 14, 2024
763a693
ci: update build version to 01.10.00.93
Nov 14, 2024
de4d6c5
ENH: CLI: refine downward_check logic
lanewei120 Nov 14, 2024
3d6f122
FIX:If the angle and linear deflections get
MackBambu Nov 14, 2024
ea98960
ci: update build version to 01.10.00.94
Nov 14, 2024
aed9dd9
ENH: version: bumped to 1.10.1
lanewei120 Nov 15, 2024
4be2246
ci: update network module based on commit adbaa57
Nov 15, 2024
5f8b686
ci: update network module based on commit bf743ea
Nov 15, 2024
d349a9f
FIX: pause layer not working
XunZhangBambu Nov 15, 2024
c9faf8d
FIX: finish time not display
DanBao-Bambu Nov 15, 2024
f4b18a9
FIX: wrong use of reverse iter
XunZhangBambu Nov 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
FIX:use ui_and_3d_volume_map to change filament
for cut and text object
jira:github 5195

Change-Id: I17cd57fef0e4882167643174ae2ba36023cbe349
  • Loading branch information
Haidiye00 authored and lanewei120 committed Nov 15, 2024
commit dc2282cf8739b7541199c11ad9333e4a2c205a08
15 changes: 9 additions & 6 deletions src/slic3r/GUI/GUI_ObjectList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -909,12 +909,15 @@ void ObjectList::update_filament_in_config(const wxDataViewItem& item)
}
else {
const int obj_idx = m_objects_model->GetIdByItem(m_objects_model->GetObject(item));
if (item_type & itVolume)
{
const int volume_id = m_objects_model->GetVolumeIdByItem(item);
if (obj_idx < 0 || volume_id < 0)
return;
m_config = &(*m_objects)[obj_idx]->volumes[volume_id]->config;
if (item_type & itVolume){
const int ui_volume_idx = m_objects_model->GetVolumeIdByItem(item);
if (obj_idx < 0 || ui_volume_idx < 0)
return;
auto &ui_and_3d_volume_map = m_objects_model->get_ui_and_3d_volume_map();
if (ui_and_3d_volume_map.find(ui_volume_idx) == ui_and_3d_volume_map.end()) {
return;
}
m_config = &(*m_objects)[obj_idx]->volumes[ui_and_3d_volume_map[ui_volume_idx]]->config;
}
else if (item_type & itLayer)
m_config = &get_item_config(item);
Expand Down