diff options
| author | Antonioya <blendergit@gmail.com> | 2019-06-28 14:54:09 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-06-28 14:56:16 +0300 |
| commit | 4f3f68df300539472264412f3b79e1024f70eb0d (patch) | |
| tree | 36386b46260afc6e562888bcc853c5f281262948 /source/blender/makesdna/DNA_object_enums.h | |
| parent | d7d9320f09e0f9f53c50f63a1f10984c2c1eaafe (diff) | |
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
Diffstat (limited to 'source/blender/makesdna/DNA_object_enums.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_enums.h | 6 |
1 files changed, 4 insertions, 2 deletions
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__ */ |