[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40094] trunk/blender: Navigation Mesh Modifier:

[Thomas Dinges]

Revision: 40094
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40094
Author:   dingto
Date:     2011-09-10 09:21:46 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
Navigation Mesh Modifier:
* Fix scons define for operator append
* Don't use abbreviations in the UI. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    trunk/blender/source/blender/editors/object/SConscript
    trunk/blender/source/blender/editors/object/object_navmesh.cpp

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py	2011-09-10 09:06:42 UTC (rev 40093)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py	2011-09-10 09:21:46 UTC (rev 40094)
@@ -380,9 +380,8 @@
         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)

Modified: trunk/blender/source/blender/editors/object/SConscript
===================================================================
--- trunk/blender/source/blender/editors/object/SConscript	2011-09-10 09:06:42 UTC (rev 40093)
+++ trunk/blender/source/blender/editors/object/SConscript	2011-09-10 09:21:46 UTC (rev 40094)
@@ -20,5 +20,8 @@
 
 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] )

Modified: trunk/blender/source/blender/editors/object/object_navmesh.cpp
===================================================================
--- trunk/blender/source/blender/editors/object/object_navmesh.cpp	2011-09-10 09:06:42 UTC (rev 40093)
+++ trunk/blender/source/blender/editors/object/object_navmesh.cpp	2011-09-10 09:21:46 UTC (rev 40094)
@@ -537,7 +537,7 @@
 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 @@
 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";