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:
authorCampbell Barton <ideasman42@gmail.com>2011-10-10 01:11:51 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-10-10 01:11:51 +0400
commit7306eb84f07c92a5bced22f7f38dd7de1770c425 (patch)
treebbf9ba1bdbeae8ce5be45972314ed32905e3a9a5 /release
parent9d70e050a27ce4700e0e16dd120c343bd5ecc2a6 (diff)
move NavMesh draw code out of being a modifier and into DerivedMesh drawing hack (which IMHO is less bad then mis-using a modifier only to override drawing calls).
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_modifier.py4
-rw-r--r--release/scripts/startup/bl_ui/properties_game.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index d2d4c263d50..62261af729f 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -379,10 +379,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col.label(text="Mirror Object:")
col.prop(md, "mirror_object", text="")
- def NAVMESH(self, layout, ob, md):
- layout.operator("mesh.assign_navpolygon")
- layout.operator("mesh.assign_new_navpolygon")
-
def MULTIRES(self, layout, ob, md):
layout.row().prop(md, "subdivision_type", expand=True)
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index 7650e7b6ee1..6925836c5a2 100644
--- a/release/scripts/startup/bl_ui/properties_game.py
+++ b/release/scripts/startup/bl_ui/properties_game.py
@@ -166,6 +166,9 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
elif game.physics_type in {'SENSOR', 'INVISIBLE', 'NO_COLLISION', 'OCCLUDE'}:
layout.prop(ob, "hide_render", text="Invisible")
+ elif game.physics_type == 'NAVMESH':
+ layout.operator("mesh.assign_navpolygon")
+ layout.operator("mesh.assign_new_navpolygon")
class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, Panel):