[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54037] trunk/blender/release/scripts/ startup/bl_ui: UI / Layout scripts:
Thomas Dinges
blender at dingto.org
Wed Jan 23 12:40:40 CET 2013
Revision: 54037
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54037
Author: dingto
Date: 2013-01-23 11:40:35 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
UI / Layout scripts:
* Code cleanup for new Rigid Body panels.
* Removed some unneeded split() calls.
* Remove redundant check for "ob.rigid_body_constraint" in the draw() function of the "Rigid Body Constraint" panel. The check is already made in the poll.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.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 11:24:48 UTC (rev 54036)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py 2013-01-23 11:40:35 UTC (rev 54037)
@@ -50,13 +50,10 @@
if rbo is not None:
layout.prop(rbo, "type", text="Type")
-
- row = layout.row()
- row.prop(rbo, "kinematic", text="Animated")
+ layout.prop(rbo, "kinematic", text="Animated")
if rbo.type == 'ACTIVE':
- col = layout.column()
- col.prop(rbo, "mass")
+ layout.prop(rbo, "mass")
class PHYSICS_PT_rigid_body_collisions(PHYSICS_PT_rigidbody_panel, Panel):
@@ -91,6 +88,7 @@
sub = col.column()
sub.active = rbo.use_margin
sub.prop(rbo, "collision_margin", text="Margin")
+
layout.prop(rbo, "collision_groups")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py 2013-01-23 11:24:48 UTC (rev 54036)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py 2013-01-23 11:40:35 UTC (rev 54037)
@@ -42,174 +42,167 @@
ob = context.object
rbc = ob.rigid_body_constraint
- if rbc:
- layout.prop(rbc, "type")
+ layout.prop(rbc, "type")
- split = layout.split()
+ row = layout.row()
+ row.prop(rbc, "enabled")
+ row.prop(rbc, "disable_collisions")
- row = split.row()
- row.prop(rbc, "enabled")
- row.prop(rbc, "disable_collisions")
+ layout.prop(rbc, "object1")
+ layout.prop(rbc, "object2")
- split = layout.split()
- split.prop(rbc, "object1")
- split = layout.split()
- split.prop(rbc, "object2")
+ row = layout.row()
+ row.prop(rbc, "use_breaking")
+ sub = row.row()
+ sub.active = rbc.use_breaking
+ sub.prop(rbc, "breaking_threshold", text="Threshold")
- split = layout.split()
- col = split.row()
- col.prop(rbc, "use_breaking")
- sub = col.column()
- sub.active = rbc.use_breaking
- sub.prop(rbc, "breaking_threshold", text="Threshold")
+ row = layout.row()
+ row.prop(rbc, "override_solver_iterations", text="Override Iterations")
+ sub = row.row()
+ sub.active = rbc.override_solver_iterations
+ sub.prop(rbc, "num_solver_iterations", text="Iterations")
- split = layout.split()
- col = split.row()
- col.prop(rbc, "override_solver_iterations", text="Override Iterations")
- sub = col.split()
- sub.active = rbc.override_solver_iterations
- sub.prop(rbc, "num_solver_iterations", text="Iterations")
+ if rbc.type == 'HINGE':
+ col = layout.column(align=True)
+ col.label("Limits:")
- if rbc.type == 'HINGE':
- col = layout.column(align=True)
- col.label("Limits:")
+ row = col.row()
+ sub = row.row()
+ sub.scale_x = 0.5
+ sub.prop(rbc, "use_limit_ang_z", toggle=True)
+ sub = row.row()
+ sub.active = rbc.use_limit_ang_z
+ sub.prop(rbc, "limit_ang_z_lower", text="Lower")
+ sub.prop(rbc, "limit_ang_z_upper", text="Upper")
- row = col.row()
- sub = row.row()
- sub.scale_x = 0.5
- sub.prop(rbc, "use_limit_ang_z", toggle=True)
- sub = row.row()
- sub.active = rbc.use_limit_ang_z
- sub.prop(rbc, "limit_ang_z_lower", text="Lower")
- sub.prop(rbc, "limit_ang_z_upper", text="Upper")
+ elif rbc.type == 'SLIDER':
+ col = layout.column(align=True)
+ col.label("Limits:")
- elif rbc.type == 'SLIDER':
- col = layout.column(align=True)
- col.label("Limits:")
+ row = col.row()
+ sub = row.row()
+ sub.scale_x = 0.5
+ sub.prop(rbc, "use_limit_lin_x", toggle=True)
+ sub = row.row()
+ sub.active = rbc.use_limit_lin_x
+ sub.prop(rbc, "limit_lin_x_lower", text="Lower")
+ sub.prop(rbc, "limit_lin_x_upper", text="Upper")
- row = col.row()
- sub = row.row()
- sub.scale_x = 0.5
- sub.prop(rbc, "use_limit_lin_x", toggle=True)
- sub = row.row()
- sub.active = rbc.use_limit_lin_x
- sub.prop(rbc, "limit_lin_x_lower", text="Lower")
- sub.prop(rbc, "limit_lin_x_upper", text="Upper")
+ elif rbc.type == 'PISTON':
+ col = layout.column(align=True)
+ col.label("Limits:")
- elif rbc.type == 'PISTON':
- col = layout.column(align=True)
- col.label("Limits:")
+ row = col.row()
+ sub = row.row()
+ sub.scale_x = 0.5
+ sub.prop(rbc, "use_limit_lin_x", toggle=True)
+ sub = row.row()
+ sub.active = rbc.use_limit_lin_x
+ sub.prop(rbc, "limit_lin_x_lower", text="Lower")
+ sub.prop(rbc, "limit_lin_x_upper", text="Upper")
- row = col.row()
- sub = row.row()
- sub.scale_x = 0.5
- sub.prop(rbc, "use_limit_lin_x", toggle=True)
- sub = row.row()
- sub.active = rbc.use_limit_lin_x
- sub.prop(rbc, "limit_lin_x_lower", text="Lower")
- sub.prop(rbc, "limit_lin_x_upper", text="Upper")
+ col = layout.column(align=True)
- col = layout.column(align=True)
+ row = col.row()
+ sub = row.row()
+ sub.scale_x = 0.5
+ sub.prop(rbc, "use_limit_ang_x", toggle=True)
+ sub = row.row()
+ sub.active = rbc.use_limit_ang_x
+ sub.prop(rbc, "limit_ang_x_lower", text="Lower")
+ sub.prop(rbc, "limit_ang_x_upper", text="Upper")
- row = col.row()
- sub = row.row()
- sub.scale_x = 0.5
- sub.prop(rbc, "use_limit_ang_x", toggle=True)
- sub = row.row()
- sub.active = rbc.use_limit_ang_x
- sub.prop(rbc, "limit_ang_x_lower", text="Lower")
- sub.prop(rbc, "limit_ang_x_upper", text="Upper")
+ elif rbc.type in {'GENERIC', 'GENERIC_SPRING'}:
+ col = layout.column(align=True)
+ col.label("Limits:")
- elif rbc.type in {'GENERIC', 'GENERIC_SPRING'}:
- col = layout.column(align=True)
- col.label("Limits:")
+ row = col.row()
+ sub = row.row()
+ sub.scale_x = 0.5
+ sub.prop(rbc, "use_limit_lin_x", toggle=True)
+ sub = row.row()
+ sub.active = rbc.use_limit_lin_x
+ sub.prop(rbc, "limit_lin_x_lower", text="Lower")
+ sub.prop(rbc, "limit_lin_x_upper", text="Upper")
- row = col.row()
- sub = row.row()
- sub.scale_x = 0.5
- sub.prop(rbc, "use_limit_lin_x", toggle=True)
- sub = row.row()
- sub.active = rbc.use_limit_lin_x
- sub.prop(rbc, "limit_lin_x_lower", text="Lower")
- sub.prop(rbc, "limit_lin_x_upper", text="Upper")
+ row = col.row()
+ sub = row.row()
+ sub.scale_x = 0.5
+ sub.prop(rbc, "use_limit_lin_y", toggle=True)
+ sub = row.row()
+ sub.active = rbc.use_limit_lin_y
+ sub.prop(rbc, "limit_lin_y_lower", text="Lower")
+ sub.prop(rbc, "limit_lin_y_upper", text="Upper")
- row = col.row()
- sub = row.row()
- sub.scale_x = 0.5
- sub.prop(rbc, "use_limit_lin_y", toggle=True)
- sub = row.row()
- sub.active = rbc.use_limit_lin_y
- sub.prop(rbc, "limit_lin_y_lower", text="Lower")
- sub.prop(rbc, "limit_lin_y_upper", text="Upper")
+ row = col.row()
+ sub = row.row()
+ sub.scale_x = 0.5
+ sub.prop(rbc, "use_limit_lin_z", toggle=True)
+ sub = row.row()
+ sub.active = rbc.use_limit_lin_z
+ sub.prop(rbc, "limit_lin_z_lower", text="Lower")
+ sub.prop(rbc, "limit_lin_z_upper", text="Upper")
- row = col.row()
- sub = row.row()
- sub.scale_x = 0.5
- sub.prop(rbc, "use_limit_lin_z", toggle=True)
- sub = row.row()
- sub.active = rbc.use_limit_lin_z
- sub.prop(rbc, "limit_lin_z_lower", text="Lower")
- sub.prop(rbc, "limit_lin_z_upper", text="Upper")
+ col = layout.column(align=True)
+ row = col.row()
+ sub = row.row()
+ sub.scale_x = 0.5
+ sub.prop(rbc, "use_limit_ang_x", toggle=True)
+ sub = row.row()
+ sub.active = rbc.use_limit_ang_x
+ sub.prop(rbc, "limit_ang_x_lower", text="Lower")
+ sub.prop(rbc, "limit_ang_x_upper", text="Upper")
+
+ row = col.row()
+ sub = row.row()
+ sub.scale_x = 0.5
+ sub.prop(rbc, "use_limit_ang_y", toggle=True)
+ sub = row.row()
+ sub.active = rbc.use_limit_ang_y
+ sub.prop(rbc, "limit_ang_y_lower", text="Lower")
+ sub.prop(rbc, "limit_ang_y_upper", text="Upper")
+
+ row = col.row()
+ sub = row.row()
+ sub.scale_x = 0.5
+ sub.prop(rbc, "use_limit_ang_z", toggle=True)
+ sub = row.row()
+ sub.active = rbc.use_limit_ang_z
+ sub.prop(rbc, "limit_ang_z_lower", text="Lower")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list