svn merge ^/trunk/blender -r40872:40890

2011-10-13 22:50:01 +00:00
parent 02b409ee13 f6cd962df7
commit 7eadd540d4
21 changed files with 360 additions and 396 deletions
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -383,10 +383,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)