diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-17 08:59:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-17 08:59:14 +0400 |
| commit | 1ff373ef5bb0c1462ad8b0f30cfb773e30cbb2bb (patch) | |
| tree | b6ec7b01b644cc8c0d4d743a4d3d94551b59f2b1 /source/blender/editors/object/object_modifier.c | |
| parent | 594b0298c7a672fca44890d3afd1e5bf4f06c1da (diff) | |
| parent | 2636be0ac0d3139b2c9cf54f6380b2e9a3d3ed51 (diff) | |
svn merge -r40166:40279 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/object/object_modifier.c')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 4361f53ab85..a78c3f3105f 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -736,7 +736,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; |