[Bf-blender-cvs] [938fa93] master: gameengine physics: removing compound option for character controllers

[Ines Almeida]

Commit: 938fa934c87a9feba0ab55ed204a2617d082b706
Author: Ines Almeida
Date:   Sun Aug 17 19:40:33 2014 +0200
Branches: master
https://developer.blender.org/rB938fa934c87a9feba0ab55ed204a2617d082b706

gameengine physics: removing compound option for character controllers

Cherrypicking c31d921 onto 117edbb
Conflicts:
	release/scripts/startup/bl_ui/properties_game.py

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

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 3daf938..2b229a4 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"