Commit Graph

10301 Commits

Author SHA1 Message Date
Lukas Matena
eeef3b42df SLA gizmo now uses the new separate undo/redo stack for manual editing mode 2019-07-29 13:07:49 +02:00
YuSanka
b8a549259c Merge remote-tracking branch 'origin/master' into ys_overrides 2019-07-28 22:12:27 +02:00
YuSanka
d0d01ef7ab Merge remote-tracking branch 'origin/vb_filament_overrides' into ys_overrides 2019-07-28 22:01:48 +02:00
YuSanka
40a576a8ad Implemented update of the override filaments options from/to config 2019-07-28 22:00:39 +02:00
Lukas Matena
fe62362960 Hiding the sla support structures after undo/redo 2019-07-28 11:37:08 +02:00
Vojtech Kral
dda7b3fc52 Merge branch 'vk-bugfixes':
- Fix a ternary op type error in Tab
- Build: Remove SLIC3R_SYNTAXONLY
2019-07-26 14:28:01 +02:00
Vojtech Kral
ba21d606af Fix a ternary op type error in Tab
Fix #2668
Fix #2676
2019-07-26 14:27:37 +02:00
Vojtech Kral
26c2b16f61 Build: Remove SLIC3R_SYNTAXONLY 2019-07-26 14:27:37 +02:00
bubnikv
08a90b8c1b Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-26 13:44:41 +02:00
bubnikv
30d4bfd410 New Undo / Redo stack for the gizmos. The Gizmo specific stack is
entered with Plater::enter_gizmos_stack(), and left with
Plater::enter_gizmos_stack(). Other than that, the 2nd Undo / Redo
stack is transparent to the user of the Plater.

WIP: Currently the Gizmo stack takes a snapshot of the whole scene on
Plater::enter_gizmos_stack(). While it should work, it may be cheaper
to modify the Undo/Redo stack to only take a snapshot of the gizmos
in the Gizmo mode.
2019-07-26 13:44:33 +02:00
Enrico Turri
9593da2613 Take a single undo/redo snapshot when pasting from clipboard 2019-07-26 13:06:49 +02:00
Enrico Turri
eefd950e16 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-26 11:34:05 +02:00
Enrico Turri
10b27968d1 Code cleanup 2019-07-26 11:32:44 +02:00
Enrico Turri
e8c38a93fc Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-26 09:45:42 +02:00
Enrico Turri
77857f7292 Refactoring into rendering pipeline 2019-07-26 09:45:22 +02:00
YuSanka
99bd054e99 Fixed updating of an option list for additional settings 2019-07-25 17:25:14 +02:00
bubnikv
17edc289e9 Fixed missing return value. 2019-07-25 17:18:51 +02:00
bubnikv
86287a28ec Fixed the Perl bindings, made Print::m_placeholder_parser protected,
removed the non-const accessor method to m_placeholder_parser.
2019-07-25 17:08:31 +02:00
YuSanka
6ea692ff34 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-25 16:23:57 +02:00
YuSanka
77401ed79d Upgrade for ModeButtons 2019-07-25 16:23:32 +02:00
Enrico Turri
f4209dce0b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-25 15:29:58 +02:00
Enrico Turri
9bcdb2ebd0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-25 15:29:25 +02:00
Enrico Turri
4e4bdb5edd Removed obsolete code 2019-07-25 15:28:34 +02:00
bubnikv
34013ad142 Fixed broken Perl bindings. 2019-07-25 14:52:51 +02:00
bubnikv
2bcdfc8378 Merge remote-tracking branch 'remotes/origin/master' into vb_filament_overrides 2019-07-25 14:40:54 +02:00
bubnikv
f8218eb903 Reworked the FFF Print::update() to process the filament retract
override values and to store them into the output G-code.
2019-07-25 14:39:19 +02:00
Enrico Turri
e5b108b26e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-25 13:44:02 +02:00
Enrico Turri
e23dbfa3fb Added missing include (OsX build) 2019-07-25 13:42:42 +02:00
Enrico Turri
0745a94a98 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-25 13:11:17 +02:00
Enrico Turri
d27d3257f7 Added tooltip to filename fields for custom texture and model into bed shape dialog to show the full path of the file 2019-07-25 13:10:57 +02:00
Enrico Turri
e86d40fe98 Modified bundled bed models 2019-07-25 11:35:16 +02:00
Enrico Turri
d6f03a2f52 Bed model placed into the scene so that its origin goes into shape center 2019-07-25 11:34:42 +02:00
Enrico Turri
bc680b8376 Draw lighter gridlines when rendering default procedural texture on print bed when seen from above and custom model is present 2019-07-25 10:38:18 +02:00
Enrico Turri
9625fe8f5b Render custom bed model on custom beds 2019-07-25 09:45:43 +02:00
Enrico Turri
48dc2bb762 Fixed positioning of bed model into the scene and changed bundled bed models 2019-07-25 08:43:21 +02:00
Enrico Turri
1483a7fd51 Render custom bed model on prusa beds 2019-07-24 14:02:36 +02:00
Enrico Turri
0a04a6d92a Add remove all from selection command to undo/redo stack only when the redo stack is empty 2019-07-24 13:51:39 +02:00
YuSanka
ab2519cde4 Merge remote-tracking branch 'origin/master' into ys_overrides 2019-07-24 12:47:00 +02:00
YuSanka
dd50c9f062 Merge remote-tracking branch 'origin/vb_filament_overrides' into ys_overrides 2019-07-24 12:40:07 +02:00
bubnikv
42c8940795 Fixed is_nil() method on ConfigOptions.
PlaceholderParser was extended to support external config.
The external config has a lowest priority when looking up a variable.
2019-07-24 12:39:01 +02:00
YuSanka
1a3fc0994b Fix for 0592ae65ee 2019-07-24 12:32:38 +02:00
YuSanka
0592ae65ee Completed setting of the item focus in ObjectList after undo/redo 2019-07-24 11:25:04 +02:00
Enrico Turri
395e794b9e Refactoring in Bed3D 2019-07-24 11:04:04 +02:00
Enrico Turri
f7d238cb2d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-24 10:11:28 +02:00
Enrico Turri
7e7550b416 Custom bed texture applied to custom bed shapes 2019-07-24 10:11:17 +02:00
Enrico Turri
1f083ac1ee Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-24 09:47:11 +02:00
Enrico Turri
18965f5c22 Do not store into undo/redo stack remove all from selection command 2019-07-24 09:47:01 +02:00
YuSanka
62f997d167 Merge remote-tracking branch 'origin/vb_filament_overrides' into ys_overrides 2019-07-24 09:29:10 +02:00
YuSanka
804e1b1939 Fixed ObjectList::last_volume_is_deleted() to avoid clearing volume[0].config after undo/redo 2019-07-23 17:30:32 +02:00
bubnikv
6ea3a8e2b4 WIP: Nullable config values. Fixed compare operator for float vectors. 2019-07-23 17:15:34 +02:00