diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 03:58:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 03:58:17 +0400 |
commit | dd037a85a02b9344045c6f4cb8ff792827b69eff (patch) | |
tree | e75ff5e3ac66cdea5c30ecb98d88e85aa6a0a3b3 /source/blender/editors/object/object_modifier.c | |
parent | c3b9ec82d0cb1df9b88948e9ff02e2cb80cb89e1 (diff) |
code cleanup: remove unused define, correct header guard mismatch, add NULL check so DM_to_mesh() can have a NULL object passed (currently not used) and remove redundant NULL check.
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 651ee8b295a..03d51fcbe82 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -873,7 +873,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 ? ob->mode : 0; + int mode_orig = ob->mode; if (!md || !ED_object_modifier_remove(op->reports, bmain, ob, md)) return OPERATOR_CANCELLED; |