diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2014-08-17 21:40:33 +0400 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2015-02-19 14:20:17 +0300 |
| commit | 938fa934c87a9feba0ab55ed204a2617d082b706 (patch) | |
| tree | 84a290a072e5aeddb9474e459eaeecd378961b27 /release/scripts | |
| parent | 0049c22ad90f4f0d63710d01708b3b290e1cfcd5 (diff) | |
gameengine physics: removing compound option for character controllers
Cherrypicking c31d921 onto 117edbb
Conflicts:
release/scripts/startup/bl_ui/properties_game.py
Diffstat (limited to 'release/scripts')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_game.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 3daf938d6b9..2b229a4cf4f 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -227,8 +227,9 @@ class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, Panel): row = layout.row() row.prop(game, "collision_margin", text="Margin", slider=True) - row.prop(game, "use_collision_compound", text="Compound") - + sub = row.row() + sub.active = game.physics_type not in {'SOFT_BODY', 'CHARACTER'} + sub.prop(game, "use_collision_compound", text="Compound") class PHYSICS_PT_game_obstacles(PhysicsButtonsPanel, Panel): bl_label = "Create Obstacle" |