diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-11 08:09:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-11 08:09:11 +0400 |
| commit | fa5275cdfa136dd81a15cd2d37f8dadf77f7bcee (patch) | |
| tree | 6cd4a69631fdcc6df942c1825f2cb191f883c2f6 /source/blender | |
| parent | e8bcccae33cc9df93b7ab25a51326962fc9e8bf4 (diff) | |
- bpy.path.abspath(), added optional library argument since any paths from linked datablocks are relative to this, not the blend files path, this saves kludgy path code wherever libraries may be used.
- Image "Edit Externally" operator can now edit relative library images.
also minor edits to navmesh.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/mesh/mesh_navmesh.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index bc6492f92ae..c379111ccfd 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -64,6 +64,7 @@ #ifdef WITH_GAMEENGINE #include "BKE_navmesh_conversion.h" +static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm); #endif #include "BLO_sys_types.h" // for intptr_t support @@ -77,8 +78,6 @@ extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */ -static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm); - /////////////////////////////////// /////////////////////////////////// diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index bd5f4b5fe68..b8ace26991e 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -459,12 +459,14 @@ static int create_navmesh_exec(bContext *C, wmOperator *op) MEM_freeN(verts); MEM_freeN(tris); + + return OPERATOR_FINISHED; } else { BKE_report(op->reports, RPT_ERROR, "No mesh objects found"); - } - return OPERATOR_FINISHED; + return OPERATOR_CANCELLED; + } } void MESH_OT_navmesh_make(wmOperatorType *ot) |