[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54029] trunk/blender/release/scripts/ startup/bl_ui: move rigidbody toggle into the header for scene and objects.
Campbell Barton
ideasman42 at gmail.com
Wed Jan 23 08:42:33 CET 2013
Revision: 54029
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54029
Author: campbellbarton
Date: 2013-01-23 07:42:28 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
move rigidbody toggle into the header for scene and objects.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py 2013-01-23 07:26:39 UTC (rev 54028)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py 2013-01-23 07:42:28 UTC (rev 54029)
@@ -35,7 +35,13 @@
ob = context.object
rd = context.scene.render
return (ob and ob.rigid_body and (not rd.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
@@ -46,7 +52,6 @@
layout.prop(rbo, "type", text="Type")
row = layout.row()
- row.prop(rbo, "enabled");
row.prop(rbo, "kinematic", text="Animated")
if rbo.type == 'ACTIVE':
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_scene.py 2013-01-23 07:26:39 UTC (rev 54028)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_scene.py 2013-01-23 07:42:28 UTC (rev 54029)
@@ -252,10 +252,16 @@
@classmethod
def poll(cls, context):
- rd = context.scene.render
scene = context.scene
+ rd = scene.render
return scene and (rd.engine in cls.COMPAT_ENGINES)
+ def draw_header(self, context):
+ scene = context.scene
+ rbw = scene.rigidbody_world
+ if rbw is not None:
+ self.layout.prop(rbw, "enabled", text="")
+
def draw(self, context):
layout = self.layout
@@ -268,8 +274,6 @@
else:
split = layout.split()
split.operator("rigidbody.world_remove")
- layout.separator()
- layout.prop(context.scene.rigidbody_world, "enabled")
layout.active = rbw.enabled
col = layout.column()
More information about the Bf-blender-cvs
mailing list