From 4be4c06671551da62edf197df6e7ad8c89dc2fe0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 15 Mar 2020 21:48:35 +1100 Subject: Cleanup: redundant checks In some cases moved the checks into asserts, to ensure changes in the future don't cause the checks to become necessary again. --- source/blender/editors/object/object_modes.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/object/object_modes.c') diff --git a/source/blender/editors/object/object_modes.c b/source/blender/editors/object/object_modes.c index edc2f15813c..f06b6a4db2a 100644 --- a/source/blender/editors/object/object_modes.c +++ b/source/blender/editors/object/object_modes.c @@ -282,7 +282,9 @@ static bool ed_object_mode_generic_exit_ex(struct Main *bmain, ED_object_posemode_exit_ex(bmain, ob); } } - else if ((ob->type == OB_GPENCIL) && ((ob->mode & OB_MODE_OBJECT) == 0)) { + else if (ob->type == OB_GPENCIL) { + /* Accounted for above. */ + BLI_assert((ob->mode & OB_MODE_OBJECT) == 0); if (only_test) { return true; } -- cgit v1.2.3