Navigation Mesh Modifier:
authorThomas Dinges <blender@dingto.org>
Sat, 10 Sep 2011 09:21:46 +0000 (09:21 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 10 Sep 2011 09:21:46 +0000 (09:21 +0000)
* Fix scons define for operator append
* Don't use abbreviations in the UI.

release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/editors/object/SConscript
source/blender/editors/object/object_navmesh.cpp

index d8860d986543d07aef8525645813ea1d6d20687a..8e90dc3216eeba2ffd02463b818edb14b0d63bba 100644 (file)
@@ -380,9 +380,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(md, "mirror_object", text="")
 
     def NAVMESH(self, layout, ob, md):
-        row = layout.row()
-        row.operator("object.assign_navpolygon", text="Assign poly idx")
-        row.operator("object.assign_new_navpolygon", text="Assign new poly idx")
+        layout.operator("object.assign_navpolygon")
+        layout.operator("object.assign_new_navpolygon")
 
     def MULTIRES(self, layout, ob, md):
         layout.row().prop(md, "subdivision_type", expand=True)
index 900c96044a54aeaf261fd9706c0dd5008260ad28..cdda16582eff5966cde490c0506f3508fd4e924a 100644 (file)
@@ -20,5 +20,8 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
 
 if env['WITH_BF_PYTHON']:
     defs.append('WITH_PYTHON')
+  
+if env['WITH_BF_GAMEENGINE']:
+    defs.append('WITH_GAMEENGINE')
 
 env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs, libtype=['core'], priority=[35] )
index 8ee63296c7028e58f32d4aefde9b1fc6fcc8df8c..155ffd37627ba21b01b91aabd9f4865d3840cf92 100644 (file)
@@ -537,7 +537,7 @@ static int assign_navpolygon_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_assign_navpolygon(struct wmOperatorType *ot)
 {
        /* identifiers */
-       ot->name= "Assign polygon index ";
+       ot->name= "Assign polygon index";
        ot->description= "Assign polygon index to face by active face";
        ot->idname= "OBJECT_OT_assign_navpolygon";
 
@@ -615,7 +615,7 @@ static int assign_new_navpolygon_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_assign_new_navpolygon(struct wmOperatorType *ot)
 {
        /* identifiers */
-       ot->name= "Assign new polygon index ";
+       ot->name= "Assign new polygon index";
        ot->description= "Assign new polygon index to face";
        ot->idname= "OBJECT_OT_assign_new_navpolygon";