diff options
author | Julian Eisel <julian@blender.org> | 2020-03-16 20:13:37 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-03-16 20:13:37 +0300 |
commit | d2ef342b2a50a7eac725889708fd689ffa126e25 (patch) | |
tree | d6606e846b40bf517ab13477003e5e556ae26b66 /source/blender/editors/object/object_modes.c | |
parent | cb6cec904fa14ce0ab10a2a53af5c936d56376cf (diff) | |
parent | e42f61dda8b635511f083c09ccda5db9d28ec172 (diff) |
Merge branch 'master' into temp-openxr-ghostxr
Diffstat (limited to 'source/blender/editors/object/object_modes.c')
-rw-r--r-- | source/blender/editors/object/object_modes.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |