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
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
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
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
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
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
YuSanka
a121253520
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-23 16:18:14 +02:00
YuSanka
4245b61afc
Added SETTINGS_SELECTED_ON_SIDEBAR flag to undo/redo
2019-07-23 16:17:37 +02:00
YuSanka
7bc893d99a
Update all extriders nozzle diameters according to the single_extruder_multi_material flag
2019-07-23 16:12:52 +02:00
Enrico Turri
1f24e82690
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo
2019-07-23 15:34:38 +02:00
Lukas Matena
0ae46b0635
SLA gizmo and undo/redo: 'autogenerated points' state is now correctly undone/redone
2019-07-23 15:23:38 +02:00
Enrico Turri
9a127ed016
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo
2019-07-23 15:14:19 +02:00
Enrico Turri
0d10d8aba7
1st installment for selection's undo/redo snapshots
2019-07-23 15:14:08 +02:00
Lukas Matena
0a5f8aa2e8
An attempt to silence the Wreorder warning on OSX build server
...
Clang apparently cares about order of command line arguments, so -Wall should come before -Wno-whatever
2019-07-23 15:13:47 +02:00
bubnikv
3b1a44c084
WIP: Nullable configuration value concept, implemented for
...
ConfigOptionFloatsNullable, ConfigOptionIntsNullable,
ConfigOptionPercentsNullable, ConfigOptionBoolsNullable.
retract override values were added to the Filament profile:
vector of floats: "retract_length", "retract_lift", "retract_lift_above",
"retract_lift_below", "retract_speed", "deretract_speed",
"retract_restart_extra", "retract_before_travel",
vector of bools: "retract_layer_change", "wipe"
vector of percents: "retract_before_wipe"
2019-07-23 14:15:42 +02:00
bubnikv
bb604242aa
Updated the Prusa3D profiles.
2019-07-23 14:04:10 +02:00
Lukas Matena
91a5d70a62
Fixed a few warnings in headers (meaning they were reported once for each include)
...
Fixed an identification of CXX compiler in cmake so that 'AppleClang' is recognized
2019-07-23 14:02:20 +02:00
Lukas Matena
506be9035b
Wipe tower now supports filaments with diameters different from 1.75 mm
2019-07-23 14:02:20 +02:00
Enrico Turri
3fe355509c
Fixed undo/redo snapshot when opening a project using the recent files list
2019-07-23 12:57:58 +02:00
Lukas Matena
2c6e4b4e5b
Fixed a missing include in UndoRedo.cpp
2019-07-23 09:40:07 +02:00
bubnikv
b34252bf0f
Fixed compilation on clang.
2019-07-22 17:26:06 +02:00
bubnikv
bed21b1e2d
Undo / Redo refactoring: Moved the snapshot flags definition
...
to SnapshotData
2019-07-22 17:00:50 +02:00
bubnikv
a5c64e8477
Refactoring of the Undo / Redo stack interface:
...
The Snapshot specific data, which is fully provided from the outside
of the Undo / Redo stack is now stored as an StackData structure.
The StackData structure may be extended with small size data,
like the cursor position in the side bar.
2019-07-22 16:52:47 +02:00