From 4f3f68df300539472264412f3b79e1024f70eb0d Mon Sep 17 00:00:00 2001 From: Antonioya Date: Fri, 28 Jun 2019 13:54:09 +0200 Subject: Fix T66126: Non-active Grease Pencil object stuck in draw mode Now the modes are reset for grease pencil objects. Differential Revision: http://developer.blender.org/D5138 Reviewers: @dfelinto --- source/blender/makesdna/DNA_object_enums.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/makesdna/DNA_object_enums.h') diff --git a/source/blender/makesdna/DNA_object_enums.h b/source/blender/makesdna/DNA_object_enums.h index 44aeb5feaff..75fca117b06 100644 --- a/source/blender/makesdna/DNA_object_enums.h +++ b/source/blender/makesdna/DNA_object_enums.h @@ -49,9 +49,11 @@ typedef enum eObjectMode { /** Any mode that uses Object.sculpt. */ #define OB_MODE_ALL_SCULPT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT) -/** Any mode that has data we need to free when switching modes, +/** Any mode that has data or for Grease Pencil modes, we need to free when switching modes, * see: #ED_object_mode_generic_exit */ #define OB_MODE_ALL_MODE_DATA \ - (OB_MODE_EDIT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_SCULPT | OB_MODE_POSE) + (OB_MODE_EDIT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_SCULPT | OB_MODE_POSE | \ + OB_MODE_PAINT_GPENCIL | OB_MODE_EDIT_GPENCIL | OB_MODE_SCULPT_GPENCIL | \ + OB_MODE_WEIGHT_GPENCIL) #endif /* __DNA_OBJECT_ENUMS_H__ */ -- cgit v1.2.3