diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-05 17:35:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-05 17:36:13 +0300 |
| commit | 7436fb2ef1d8bb0af0589f8ec4b45c8800aed983 (patch) | |
| tree | e99050b05bf97b20cc0f5c05ea549aa31d8fba09 /release/scripts/startup/bl_ui/properties_physics_rigidbody.py | |
| parent | d94df18550702a9df7b56feb5d58fb20effb7536 (diff) | |
| parent | c68429bc038635a6c2a3f29a5b057c077be3a4b0 (diff) | |
Merge branch 'master' into 28
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_physics_rigidbody.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_rigidbody.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py index 817b0ab76ed..3cb9026fd02 100644 --- a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py @@ -117,7 +117,7 @@ class PHYSICS_PT_rigid_body_dynamics(PHYSICS_PT_rigidbody_panel, Panel): rbo = ob.rigid_body #col = layout.column(align=1) - #col.label(text="Activation:") + # col.label(text="Activation:") # XXX: settings such as activate on collison/etc. split = layout.split() |