[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59895] branches/soc-2013-rigid_body_sim: rigidbody: UI cleanup

[Sergej Reich]

Revision: 59895
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59895
Author:   sergof
Date:     2013-09-06 17:59:00 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
rigidbody: UI cleanup

Split Activation and Deactivation into separate columns.
Rename "Enable Deactivation" -> "Allow Deactivation".
"Deactivation" is still a little misleading, maybe we should use
"Sleeping" instead?

Modified Paths:
--------------
    branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
    branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_rigidbody.c

Modified: branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
===================================================================
--- branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_physics_rigidbody.py	2013-09-06 17:58:58 UTC (rev 59894)
+++ branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_physics_rigidbody.py	2013-09-06 17:59:00 UTC (rev 59895)
@@ -112,23 +112,21 @@
         ob = context.object
         rbo = ob.rigid_body
 
-        #col = layout.column(align=1)
-        #col.label(text="Activation:")
-        # XXX: settings such as activate on collison/etc.
-
         split = layout.split()
 
         col = split.column()
+        col.label(text="Activation:")
+        col.prop(rbo, "use_start_deactivated")
+
+        col = split.column()
         col.label(text="Deactivation:")
         col.prop(rbo, "use_deactivation")
         sub = col.column()
         sub.active = rbo.use_deactivation
-        sub.prop(rbo, "use_start_deactivated")
         sub.prop(rbo, "deactivate_linear_velocity", text="Linear Vel")
         sub.prop(rbo, "deactivate_angular_velocity", text="Angular Vel")
-        # TODO: other params such as time?
 
-        col = split.column()
+        col = layout.column()
         col.label(text="Damping:")
         col.prop(rbo, "linear_damping", text="Translation")
         col.prop(rbo, "angular_damping", text="Rotation")

Modified: branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_rigidbody.c
===================================================================
--- branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_rigidbody.c	2013-09-06 17:58:58 UTC (rev 59894)
+++ branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_rigidbody.c	2013-09-06 17:59:00 UTC (rev 59895)
@@ -818,8 +818,8 @@
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", RBO_FLAG_USE_DEACTIVATION);
 	RNA_def_property_boolean_default(prop, TRUE);
 	RNA_def_property_boolean_funcs(prop, NULL, "rna_RigidBodyOb_activation_state_set");
-	RNA_def_property_ui_text(prop, "Enable Deactivation",
-	                         "Enable deactivation of resting rigid bodies (increases performance and stability "
+	RNA_def_property_ui_text(prop, "Allow Deactivation",
+	                         "Allow deactivation of resting rigid bodies (increases performance and stability "
 	                         "but can cause glitches)");
 	RNA_def_property_update(prop, NC_OBJECT | ND_POINTCACHE, "rna_RigidBodyOb_reset");