diff options
| author | Antonioya <blendergit@gmail.com> | 2019-03-04 19:05:44 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-03-04 19:06:03 +0300 |
| commit | f6bafef1e1a84ce5b5fcdbc1e53e3341d4433f3b (patch) | |
| tree | ef6ee5c6a365153d0dfadfa09795382ecb7aae65 /source/blender/makesdna/DNA_gpencil_types.h | |
| parent | b27ada979ce3b41d0e44fabf354df3d572ea2cfa (diff) | |
GPencil: Move Object Depth Order to Object
There was a conflict between Object "In Front" and how the strokes were managed in Stroke panel for grease pencil datablock.
In order to keep consistency, the order of the object has been moved to Object level and now it's using the standard "In Front" flag. As all it is 3D, the option "Back" has been removed.
This also fixes the problem with task T62137.
Also related to commit 54ffc4e19dc4 and D4405
Diffstat (limited to 'source/blender/makesdna/DNA_gpencil_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 3080975360e..bd17d4e57dc 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -460,9 +460,7 @@ typedef struct bGPdata { /** Settings for this datablock. */ int flag; - /** Xray mode for strokes (eGP_DepthOrdering). */ - short xray_mode; - char _pad1[2]; + char _pad1[4]; /* Palettes */ /** List of bGPDpalette's - Deprecated (2.78 - 2.79 only). */ @@ -616,7 +614,6 @@ typedef enum eGP_OnionModes { typedef enum eGP_DepthOrdering { GP_XRAY_FRONT = 0, GP_XRAY_3DSPACE = 1, - GP_XRAY_BACK = 2, } eGP_DepthOrdering; /* draw modes (Use 2D or 3D position) */ |