diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-07-25 22:12:04 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-07-25 22:12:04 +0300 |
| commit | 9c0dea213ed55b7a66d454bf16de8a7d6855a596 (patch) | |
| tree | 6891cae09e61eb6f6d6c57eed85aa51722b3f6bb /release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py | |
| parent | 8c9e6c59863077512e7abfa4fdedbbedfd954a87 (diff) | |
| parent | 29d1db9ed6253f68c5452be1f0125ed364d4a954 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/rigidbody.c
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py | 5 |
1 files changed, 5 insertions, 0 deletions
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 69491f36c63..5e67caadc90 100644 --- a/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py +++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py @@ -139,6 +139,11 @@ class PHYSICS_PT_rigid_body_constraint(PHYSICS_PT_rigidbody_constraint_panel, Pa sub.prop(rbc, "motor_ang_max_impulse", text="Max Impulse") elif rbc.type in {'GENERIC', 'GENERIC_SPRING'}: + if rbc.type == 'GENERIC_SPRING': + row = layout.row() + row.label("Spring Type:") + row.prop(rbc, "spring_type", text="") + col = layout.column(align=True) col.label("Limits:") |