diff options
| author | Ghostkeeper <ghost_keeper+github@hotmail.com> | 2016-03-17 17:24:00 +0300 |
|---|---|---|
| committer | Ghostkeeper <ghost_keeper+github@hotmail.com> | 2016-03-17 17:24:00 +0300 |
| commit | de9a66e1f41a849990b148c7a33515f972b39749 (patch) | |
| tree | 6063c46e88e081259f72c7fb26286b3fc8131da7 /cura/PlatformPhysics.py | |
| parent | 14f5d236b20df71438c31a20f932a75c0a955df7 (diff) | |
| parent | 479c6c3319151c79725472874880ba2c5f6612ae (diff) | |
Merge branch '2.1'
Conflicts:
plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
plugins/USBPrinting/PrinterConnection.py
resources/machines/fdmprinter.json
resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
Diffstat (limited to 'cura/PlatformPhysics.py')
| -rw-r--r-- | cura/PlatformPhysics.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index b8934b8796..4433354fdd 100644 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -88,9 +88,7 @@ class PlatformPhysics: job = ConvexHullJob.ConvexHullJob(node) job.start() node.callDecoration("setConvexHullJob", job) - - elif Selection.isSelected(node): - pass + elif Preferences.getInstance().getValue("physics/automatic_push_free"): # Check for collisions between convex hulls for other_node in BreadthFirstIterator(root): |