diff options
author | Antonioya <blendergit@gmail.com> | 2018-11-04 15:00:19 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2018-11-04 15:00:37 +0300 |
commit | 5cfcee8c393de6781423c9ef83716c94237fddfd (patch) | |
tree | ee6722664cc4f00c0f79058de878030ae42afdc6 /source/blender/makesdna | |
parent | d3c815bd0831f46c18bb4bddc9f290b5f47e2c45 (diff) |
GP: Reorganize Canvas Grid
Now the grid is always controlled by the topbar selector and not in the canvas panel. To have two places to define orientation was confuse.
The orientation by default (no lock) is always to view plane.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 10 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 42070839fac..fcaf8b00cde 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -335,7 +335,7 @@ typedef struct bGPgrid { char _pad1[4]; int lines; - int axis; + char pad_[4]; } bGPgrid; /* Grease-Pencil Annotations - 'DataBlock' */ @@ -480,14 +480,6 @@ typedef enum eGP_DepthOrdering { GP_XRAY_BACK = 2 } eGP_DepthOrdering; -/* gpencil_grid_axis */ -enum { - GP_GRID_AXIS_LOCK = (1 << 0), - GP_GRID_AXIS_X = (1 << 1), - GP_GRID_AXIS_Y = (1 << 2), - GP_GRID_AXIS_Z = (1 << 3), -}; - /* ***************************************** */ /* Mode Checking Macros */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 31627760aa3..795a48532ce 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -973,7 +973,7 @@ typedef enum eGP_EditBrush_Types { /* GP_BrushEdit_Settings.lock_axis */ typedef enum eGP_Lockaxis_Types { - GP_LOCKAXIS_NONE = 0, + GP_LOCKAXIS_VIEW = 0, GP_LOCKAXIS_X = 1, GP_LOCKAXIS_Y = 2, GP_LOCKAXIS_Z = 3 |