Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2012-08-08 05:24:48 +0400
committerMitchell Stokes <mogurijin@gmail.com>2012-08-08 05:24:48 +0400
commit843b45cafa618cd6230a16ca13f24860b3301b39 (patch)
treea060fd0e5e36b7c84c7d140b42847234ac2c13c0 /release
parente9d73dbba5a8a3e2c118eb63f9cdd0655aec3ac8 (diff)
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_game.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index 5ff49a7d369..f055ac61b72 100644
--- a/release/scripts/startup/bl_ui/properties_game.py
+++ b/release/scripts/startup/bl_ui/properties_game.py
@@ -189,8 +189,16 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
layout.operator("mesh.navmesh_reset")
layout.operator("mesh.navmesh_clear")
-
-
+
+ if physics_type not in {'NO_COLLISION', 'OCCLUDE'}:
+ layout.separator()
+ split = layout.split()
+
+ col = split.column()
+ col.prop(game, "collision_group")
+ col = split.column()
+ col.prop(game, "collision_mask")
+
class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, Panel):
bl_label = "Collision Bounds"
COMPAT_ENGINES = {'BLENDER_GAME'}