PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-06-01 12:39:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/Slic3r into mesh_repair

Browse Source
This commit is contained in:
Enrico Turri
2018-02-20 08:40:03 +01:00
parent 4dbd4d0316 d4f1ed0036
commit 6af8805920
5 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xs/src/libslic3r/GCode.cpp
View File

@@ -1384,7 +1384,7 @@ void GCode::apply_print_config(const PrintConfig &print_config)
void GCode::append_full_config(const Print& print, std::string& str)
{
char buff[1024];
char buff[4096];
const StaticPrintConfig *configs[] = { &print.config, &print.default_object_config, &print.default_region_config };
for (size_t i = 0; i < sizeof(configs) / sizeof(configs[0]); ++i) {

5
xs/src/slic3r/GUI/3DScene.cpp
View File

@@ -2211,26 +2211,31 @@ void _3DScene::_update_gcode_volumes_visibility(const GCodePreviewData& preview_
case GCodePreviewVolumeIndex::Travel:
{
volume->is_active = preview_data.travel.is_visible;
volume->zoom_to_volumes = false;
break;
}
case GCodePreviewVolumeIndex::Retraction:
{
volume->is_active = preview_data.retraction.is_visible;
volume->zoom_to_volumes = false;
break;
}
case GCodePreviewVolumeIndex::Unretraction:
{
volume->is_active = preview_data.unretraction.is_visible;
volume->zoom_to_volumes = false;
break;
}
case GCodePreviewVolumeIndex::Shell:
{
volume->is_active = preview_data.shell.is_visible;
volume->zoom_to_volumes = false;
break;
}
default:
{
volume->is_active = false;
volume->zoom_to_volumes = false;
break;
}
}

3
xs/src/slic3r/GUI/3DScene.hpp
View File

@@ -215,6 +215,7 @@ public:
drag_group_id(-1),
selected(false),
is_active(true),
zoom_to_volumes(true),
hover(false),
tverts_range(0, size_t(-1)),
qverts_range(0, size_t(-1))
@@ -253,6 +254,8 @@ public:
bool selected;
// Whether or not this volume is active for rendering
bool is_active;
// Whether or not to use this volume when applying zoom_to_volumes()
bool zoom_to_volumes;
// Boolean: Is mouse over this object?
bool hover;