diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-18 06:35:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-18 06:35:26 +0400 |
| commit | 96ada15d7940a72744dc1a63f13dbd9383b42a11 (patch) | |
| tree | 4e5527c0be1706fa28f715305d7f5b8eea4379ae /source/blender/editors/object | |
| parent | 1b5d16f1bf80f2da8d3d4da5bbfaf4819c14a225 (diff) | |
| parent | 5db33d11bd569f4040fd58e4f39cf97ed94fec29 (diff) | |
svn merge -r40197:40311 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_navmesh.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 8813b0027cd..17f174a5069 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -724,7 +724,7 @@ static int modifier_remove_exec(bContext *C, wmOperator *op) Scene *scene= CTX_data_scene(C); Object *ob = ED_object_active_context(C); ModifierData *md = edit_modifier_property_get(op, ob, 0); - int mode_orig = ob->mode; + int mode_orig = ob ? ob->mode : 0; if(!ob || !md || !ED_object_modifier_remove(op->reports, bmain, scene, ob, md)) return OPERATOR_CANCELLED; diff --git a/source/blender/editors/object/object_navmesh.cpp b/source/blender/editors/object/object_navmesh.cpp index d0768d30236..ae97b40eb49 100644 --- a/source/blender/editors/object/object_navmesh.cpp +++ b/source/blender/editors/object/object_navmesh.cpp @@ -575,7 +575,7 @@ static int findFreeNavPolyIndex(EditMesh* em) else if (indices[i]>freeIdx) break; } - delete indices; + delete [] indices; return freeIdx; } |