[Bf-blender-cvs] [c31d921] soc-2014-bge: gameengine physics: removing compound option for character controllers

[Ines Almeida]

Commit: c31d921b0d432f35a5d772989d45e9a8e5b763aa
Author: Ines Almeida
Date:   Sun Aug 17 19:40:33 2014 +0200
Branches: soc-2014-bge
https://developer.blender.org/rBc31d921b0d432f35a5d772989d45e9a8e5b763aa

gameengine physics: removing compound option for character controllers

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index b04b1b7..37bfea5 100644
--- a/release/scripts/startup/bl_ui/properties_game.py
+++ b/release/scripts/startup/bl_ui/properties_game.py
@@ -227,7 +227,7 @@ class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, Panel):
         row = layout.row()
         row.prop(game, "collision_margin", text="Margin", slider=True)
         sub = row.row()
-        sub.active = game.physics_type != 'SOFT_BODY'
+        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):