diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-16 20:14:24 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-16 20:14:24 +0300 |
| commit | ddbbd9928ec443f813ee4d46011288e360278e9f (patch) | |
| tree | 91f50fc6e8e8b68be5686903aca191d43cdafae5 /source/blender/editors/object/object_modes.c | |
| parent | b86be9b2145458037fd0b17433b7af0efa7b6472 (diff) | |
| parent | d2ef342b2a50a7eac725889708fd689ffa126e25 (diff) | |
Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside
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; } |