diff options
author | Thomas Dinges <blender@dingto.org> | 2011-09-10 13:21:46 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2011-09-10 13:21:46 +0400 |
commit | 8ed1c07a7b21d916f149dfa00649579165c45979 (patch) | |
tree | 0a51bd8a346799618263ae9033ee1f506c1f4068 | |
parent | 571f7db529c3e0f351b90e7e76b1e7aba878b3a7 (diff) |
Navigation Mesh Modifier:
* Fix scons define for operator append
* Don't use abbreviations in the UI.
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 5 | ||||
-rw-r--r-- | source/blender/editors/object/SConscript | 3 | ||||
-rw-r--r-- | source/blender/editors/object/object_navmesh.cpp | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index d8860d98654..8e90dc3216e 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -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) diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index 900c96044a5..cdda16582ef 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -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] ) diff --git a/source/blender/editors/object/object_navmesh.cpp b/source/blender/editors/object/object_navmesh.cpp index 8ee63296c70..155ffd37627 100644 --- a/source/blender/editors/object/object_navmesh.cpp +++ b/source/blender/editors/object/object_navmesh.cpp @@ -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"; |