Merge 011aa017ac into 6ad999ff8c

korman/exporter/physics.py

@@ -173,6 +173,8 @@ class PhysicsConverter:
                     physical.mass = mod.mass
                     _set_phys_prop(plSimulationInterface.kStartInactive, simIface, physical,
                                    value=mod.start_asleep)
+                    _set_phys_prop(plSimulationInterface.kAvAnimPushable, simIface, physical,
+                                   value=mod.pushable)
                 elif not mod.avatar_blocker:
                     physical.memberGroup = plSimDefs.kGroupLOSOnly
                 else:

korman/properties/modifiers/physics.py

@@ -81,6 +81,7 @@ class PlasmaCollider(PlasmaModifierProperties):
     dynamic = BoolProperty(name="Dynamic", description="Object can be influenced by other objects (ie is kickable)", default=False)
     mass = FloatProperty(name="Mass", description="Mass of object in pounds", min=0.0, default=1.0)
     start_asleep = BoolProperty(name="Start Asleep", description="Object is not active until influenced by another object", default=False)
+    pushable = BoolProperty(name="Pushable", description="Object can be pushed by the avatar (with pushing animation)", default=False)
 
     proxy_object = PointerProperty(name="Proxy",
                                    description="Object used as the collision geometry",

korman/ui/modifiers/physics.py

@@ -35,6 +35,9 @@ def collision(modifier, layout, context):
     row = col.row()
     row.active = modifier.dynamic
     row.prop(modifier, "start_asleep")
+    row = col.row()
+    row.active = modifier.dynamic
+    row.prop(modifier, "pushable")
 
     col = split.column()
     col.active = modifier.dynamic