[Bf-blender-cvs] [f2d2bafe856] master: fix rotational limits not showing for GENERIC ridgid body constraint

Philipp Oeser noreply at git.blender.org
Tue Jan 8 10:52:22 CET 2019


Commit: f2d2bafe8569188d00d5f68da296bd3279e2b243
Author: Philipp Oeser
Date:   Tue Jan 8 10:20:53 2019 +0100
Branches: master
https://developer.blender.org/rBf2d2bafe8569188d00d5f68da296bd3279e2b243

fix rotational limits not showing for GENERIC ridgid body constraint

oversight in rB502aabb9d0c5

part of T60290

===================================================================

M	release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
index 3ddf464390a..d3ed8c05fdd 100644
--- a/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
@@ -212,7 +212,7 @@ class PHYSICS_PT_rigid_body_constraint_limits_angular(PHYSICS_PT_rigidbody_const
         rbc = ob.rigid_body_constraint
 
         return (ob and rbc
-                and (rbc.type in {'GENERIC_SPRING', 'HINGE', 'PISTON'})
+                and (rbc.type in {'GENERIC', 'GENERIC_SPRING', 'HINGE', 'PISTON'})
                 and context.engine in cls.COMPAT_ENGINES)
 
     def draw(self, context):
@@ -241,7 +241,7 @@ class PHYSICS_PT_rigid_body_constraint_limits_angular(PHYSICS_PT_rigidbody_const
             sub.prop(rbc, "limit_ang_x_lower", text="X Lower")
             sub.prop(rbc, "limit_ang_x_upper", text="Upper")
 
-        elif rbc.type == 'GENERIC_SPRING':
+        elif rbc.type in {'GENERIC', 'GENERIC_SPRING'}:
             col = flow.column()
             col.prop(rbc, "use_limit_ang_x")



More information about the Bf-blender-cvs mailing list