diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-12-13 11:03:13 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-12-13 11:03:13 +0300 |
| commit | a1f87064c4c0cd9e8eafc19c599c4ad4ccdba49f (patch) | |
| tree | d016e95050f10eda7bc44e1bdfa2f7c4fc0fc024 /source/blender/makesdna/DNA_gpencil_types.h | |
| parent | d9ee88d126ddb59b68d2561694b522a99e4923b6 (diff) | |
Grease Pencil: Merge GPencil_Editing_Stage3 branch into master
This commit merges all the work done in the GPencil_Editing_Stage3 branch
as of ef2aecf2db981b5344e0d14e7f074f1742b0b2f7 into master. For more details
about the changes that this brings, see the WIP release notes:
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.77/GPencil
Diffstat (limited to 'source/blender/makesdna/DNA_gpencil_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index beffbc4c017..aa98ddb11ae 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -51,7 +51,10 @@ typedef struct bGPDspoint { /* bGPDspoint->flag */ typedef enum eGPDspoint_Flag { /* stroke point is selected (for editing) */ - GP_SPOINT_SELECT = (1 << 0) + GP_SPOINT_SELECT = (1 << 0), + + /* stroke point is tagged (for some editing operation) */ + GP_SPOINT_TAG = (1 << 1), } eGPSPoint_Flag; /* Grease-Pencil Annotations - 'Stroke' @@ -190,6 +193,7 @@ typedef enum eGPdata_Flag { /* is the block overriding all clicks? */ /* GP_DATA_EDITPAINT = (1 << 3), */ +/* ------------------------------------------------ DEPRECATED */ /* new strokes are added in viewport space */ GP_DATA_VIEWALIGN = (1 << 4), @@ -198,9 +202,13 @@ typedef enum eGPdata_Flag { GP_DATA_DEPTH_STROKE = (1 << 6), GP_DATA_DEPTH_STROKE_ENDPOINTS = (1 << 7), +/* ------------------------------------------------ DEPRECATED */ /* Stroke Editing Mode - Toggle to enable alternative keymap for easier editing of stroke points */ - GP_DATA_STROKE_EDITMODE = (1 << 8) + GP_DATA_STROKE_EDITMODE = (1 << 8), + + /* Convenience/cache flag to make it easier to quickly toggle onion skinning on/off */ + GP_DATA_SHOW_ONIONSKINS = (1 << 9) } eGPdata_Flag; #endif /* __DNA_GPENCIL_TYPES_H__ */ |