Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergej Reich <sergej.reich@googlemail.com>2013-02-21 23:04:34 +0400
committerSergej Reich <sergej.reich@googlemail.com>2013-02-21 23:04:34 +0400
commit822a06920b40eb9597115b959b3aeb26642cfce3 (patch)
treeecdcc23fcd0f972cce94b2e4af9f42f0a632992b /release
parent815e00917dcb4137f9687ab602f527920fa8c41d (diff)
rigidbody: Move "Enabled" checkbox out of rigid body panel header
Rename it to "Dynamic" to make it more obvious that it switches between static and dynamic state. Also don't show it for passive rigid bodies since it's redundant in that case.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_physics_rigidbody.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
index 922eee66ddc..d7ed7bb4d1a 100644
--- a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
+++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
@@ -36,12 +36,6 @@ class PHYSICS_PT_rigid_body(PHYSICS_PT_rigidbody_panel, Panel):
return (obj and obj.rigid_body and
(not context.scene.render.use_game_engine))
- def draw_header(self, context):
- obj = context.object
- rbo = obj.rigid_body
- if rbo is not None:
- self.layout.prop(rbo, "enabled", text="")
-
def draw(self, context):
layout = self.layout
@@ -50,7 +44,10 @@ class PHYSICS_PT_rigid_body(PHYSICS_PT_rigidbody_panel, Panel):
if rbo is not None:
layout.prop(rbo, "type", text="Type")
- layout.prop(rbo, "kinematic", text="Animated")
+ row = layout.row()
+ if rbo.type == 'ACTIVE':
+ row.prop(rbo, "enabled", text="Dynamic")
+ row.prop(rbo, "kinematic", text="Animated")
if rbo.type == 'ACTIVE':
layout.prop(rbo, "mass")