diff options
author | Antonioya <blendergit@gmail.com> | 2019-08-17 17:18:09 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2019-08-17 17:26:46 +0300 |
commit | 85f90ed6fd8858a60ea24dd82f73b88363207133 (patch) | |
tree | 51f3d1442e50505ab00c0f41ac71a7d971eb37a6 /source/blender/editors/gpencil/gpencil_intern.h | |
parent | 0e1d4dec7a7d50867c97179299775d31ac30938e (diff) |
Fix T68723: GPencil - Split Select mode for Sculpt and Edit mode
Actually, the selection mode is not visible in Sculpt mode when mask is enabled, but still is used.
Also, the mode is shared between Edit mode and Sculpt mode and for meshes the selector is by mode.
This commit splits the select mode in different properties and show the selector in Sculpt mode to define the Select mode. Also, the Select Mask button has been removed and now the Select Mode buttons work equal to Meshes where the select buttons are the mask enable too.
Fixed some old code not valid detected during these changes.
Differential Revision: https://developer.blender.org/D5500
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_intern.h')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_intern.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index 2a608d44a0b..715665fe6e9 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -635,6 +635,10 @@ struct GP_EditableStrokes_Iter { } \ (void)0 +#define GPENCIL_ANY_SCULPT_MASK(flag) \ + ((flag & (GP_SCULPT_MASK_SELECTMODE_POINT | GP_SCULPT_MASK_SELECTMODE_STROKE | \ + GP_SCULPT_MASK_SELECTMODE_SEGMENT))) + /* ****************************************************** */ #endif /* __GPENCIL_INTERN_H__ */ |