Followup to r59434 : py UI scripts edits.
[blender.git] / release / scripts / startup / bl_ui / properties_physics_rigidbody_constraint.py
index 49b760ef546932874cd931651a96f2894a110720..dcf63f25079fb0319e6e7311eb614fd0b823a23f 100644 (file)
@@ -51,27 +51,28 @@ class PHYSICS_PT_rigid_body_constraint(PHYSICS_PT_rigidbody_constraint_panel, Pa
         layout.prop(rbc, "object1")
         layout.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")
+        if rbc.type != 'MOTOR':
+            row = layout.row()
+            row.prop(rbc, "use_breaking")
+            sub = row.row()
+            sub.active = rbc.use_breaking
+            sub.prop(rbc, "breaking_threshold", text="Threshold")
 
         row = layout.row()
-        row.prop(rbc, "override_solver_iterations", text="Override Iterations")
+        row.prop(rbc, "use_override_solver_iterations", text="Override Iterations")
         sub = row.row()
-        sub.active = rbc.override_solver_iterations
-        sub.prop(rbc, "num_solver_iterations", text="Iterations")
+        sub.active = rbc.use_override_solver_iterations
+        sub.prop(rbc, "solver_iterations", text="Iterations")
 
         if rbc.type == 'HINGE':
             col = layout.column(align=True)
             col.label("Limits:")
 
-            row = col.row()
-            sub = row.row()
+            row = col.row(align=True)
+            sub = row.row(align=True)
             sub.scale_x = 0.5
             sub.prop(rbc, "use_limit_ang_z", toggle=True)
-            sub = row.row()
+            sub = row.row(align=True)
             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")
@@ -80,11 +81,11 @@ class PHYSICS_PT_rigid_body_constraint(PHYSICS_PT_rigidbody_constraint_panel, Pa
             col = layout.column(align=True)
             col.label("Limits:")
 
-            row = col.row()
-            sub = row.row()
+            row = col.row(align=True)
+            sub = row.row(align=True)
             sub.scale_x = 0.5
             sub.prop(rbc, "use_limit_lin_x", toggle=True)
-            sub = row.row()
+            sub = row.row(align=True)
             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")
@@ -93,113 +94,137 @@ class PHYSICS_PT_rigid_body_constraint(PHYSICS_PT_rigidbody_constraint_panel, Pa
             col = layout.column(align=True)
             col.label("Limits:")
 
-            row = col.row()
-            sub = row.row()
+            row = col.row(align=True)
+            sub = row.row(align=True)
             sub.scale_x = 0.5
             sub.prop(rbc, "use_limit_lin_x", toggle=True)
-            sub = row.row()
+            sub = row.row(align=True)
             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)
 
-            row = col.row()
-            sub = row.row()
+            row = col.row(align=True)
+            sub = row.row(align=True)
             sub.scale_x = 0.5
             sub.prop(rbc, "use_limit_ang_x", toggle=True)
-            sub = row.row()
+            sub = row.row(align=True)
             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 == 'MOTOR':
+            col = layout.column(align=True)
+            col.label("Linear motor:")
+
+            row = col.row(align=True)
+            sub = row.row(align=True)
+            sub.scale_x = 0.5
+            sub.prop(rbc, "use_motor_lin", toggle=True, text="Enable")
+            sub = row.row(align=True)
+            sub.active = rbc.use_motor_lin
+            sub.prop(rbc, "motor_lin_target_velocity", text="Target Velocity")
+            sub.prop(rbc, "motor_lin_max_impulse", text="Max Impulse")
+
+            col.label("Angular motor:")
+
+            row = col.row(align=True)
+            sub = row.row(align=True)
+            sub.scale_x = 0.5
+            sub.prop(rbc, "use_motor_ang", toggle=True, text="Enable")
+            sub = row.row(align=True)
+            sub.active = rbc.use_motor_ang
+            sub.prop(rbc, "motor_ang_target_velocity", text="Target Velocity")
+            sub.prop(rbc, "motor_ang_max_impulse", text="Max Impulse")
+
         elif rbc.type in {'GENERIC', 'GENERIC_SPRING'}:
             col = layout.column(align=True)
             col.label("Limits:")
 
-            row = col.row()
-            sub = row.row()
+            row = col.row(align=True)
+            sub = row.row(align=True)
             sub.scale_x = 0.5
             sub.prop(rbc, "use_limit_lin_x", toggle=True)
-            sub = row.row()
+            sub = row.row(align=True)
             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()
+            row = col.row(align=True)
+            sub = row.row(align=True)
             sub.scale_x = 0.5
             sub.prop(rbc, "use_limit_lin_y", toggle=True)
-            sub = row.row()
+            sub = row.row(align=True)
             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()
+            row = col.row(align=True)
+            sub = row.row(align=True)
             sub.scale_x = 0.5
             sub.prop(rbc, "use_limit_lin_z", toggle=True)
-            sub = row.row()
+            sub = row.row(align=True)
             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()
+            row = col.row(align=True)
+            sub = row.row(align=True)
             sub.scale_x = 0.5
             sub.prop(rbc, "use_limit_ang_x", toggle=True)
-            sub = row.row()
+            sub = row.row(align=True)
             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()
+            row = col.row(align=True)
+            sub = row.row(align=True)
             sub.scale_x = 0.5
             sub.prop(rbc, "use_limit_ang_y", toggle=True)
-            sub = row.row()
+            sub = row.row(align=True)
             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()
+            row = col.row(align=True)
+            sub = row.row(align=True)
             sub.scale_x = 0.5
             sub.prop(rbc, "use_limit_ang_z", toggle=True)
-            sub = row.row()
+            sub = row.row(align=True)
             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")
 
-            if rbc.type == 'GENERIC_SPRING':                  
+            if rbc.type == 'GENERIC_SPRING':
                 col = layout.column(align=True)
                 col.label("Springs:")
 
-                row = col.row()
-                sub = row.row()
+                row = col.row(align=True)
+                sub = row.row(align=True)
                 sub.scale_x = 0.1
                 sub.prop(rbc, "use_spring_x", toggle=True, text="X")
-                sub = row.row()
+                sub = row.row(align=True)
                 sub.active = rbc.use_spring_x
                 sub.prop(rbc, "spring_stiffness_x", text="Stiffness")
                 sub.prop(rbc, "spring_damping_x")
 
-                row = col.row()
-                sub = row.row()
+                row = col.row(align=True)
+                sub = row.row(align=True)
                 sub.scale_x = 0.1
                 sub.prop(rbc, "use_spring_y", toggle=True, text="Y")
-                sub = row.row()
+                sub = row.row(align=True)
                 sub.active = rbc.use_spring_y
                 sub.prop(rbc, "spring_stiffness_y", text="Stiffness")
                 sub.prop(rbc, "spring_damping_y")
 
-                row = col.row()
-                sub = row.row()
+                row = col.row(align=True)
+                sub = row.row(align=True)
                 sub.scale_x = 0.1
                 sub.prop(rbc, "use_spring_z", toggle=True, text="Z")
-                sub = row.row()
+                sub = row.row(align=True)
                 sub.active = rbc.use_spring_z
                 sub.prop(rbc, "spring_stiffness_z", text="Stiffness")
                 sub.prop(rbc, "spring_damping_z")