fixes for reverting 11ebdf7303

This commit is contained in:
ChrisTerBeke 2017-09-18 15:37:17 +02:00
parent 18dd63a710
commit 3db04c918f
2 changed files with 7 additions and 11 deletions

View file

@ -68,15 +68,7 @@ class PlatformPhysics:
# Move it downwards if bottom is above platform
move_vector = Vector()
# Check if this is the first time a project file node was loaded (disable auto drop in that case), defaults to True
should_auto_drop = node.getSetting("auto_drop", True)
# This should NOT happen if the scene change was triggered by a tool (like translate), only on project load
if was_triggered_by_tool:
should_auto_drop = True
# If a node is grouped or it's loaded from a project file (auto-drop disabled), don't move it down
if Preferences.getInstance().getValue("physics/automatic_drop_down") and not (node.getParent() and node.getParent().callDecoration("isGroup")) and node.isEnabled() and should_auto_drop:
if Preferences.getInstance().getValue("physics/automatic_drop_down") and not (node.getParent() and node.getParent().callDecoration("isGroup")) and node.isEnabled(): #If an object is grouped, don't move it down
z_offset = node.callDecoration("getZOffset") if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator) else 0
move_vector = move_vector.set(y=-bbox.bottom + z_offset)