Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gameengine physics: removing compound option for character controllers

Browse Source 
Cherrypicking c31d921 onto 117edbb
Conflicts:
	release/scripts/startup/bl_ui/properties_game.py
This commit is contained in:
Ines Almeida
2014-08-17 19:40:33 +02:00
parent 0049c22ad9
commit 938fa934c8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/startup/bl_ui/properties_game.py
View File

@@ -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"