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/draw/engines/gpencil/gpencil_engine.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/draw/engines/gpencil/gpencil_engine.h')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_engine.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h index 0c917b038a4..1ab45328377 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.h +++ b/source/blender/draw/engines/gpencil/gpencil_engine.h @@ -118,6 +118,7 @@ typedef struct GPENCIL_shgroup { int keep_size; int caps_mode[2]; float obj_scale; + int xray_mode; /* color of the wireframe */ float wire_color[4]; @@ -467,8 +468,8 @@ void GPENCIL_render_to_image(void *vedata, struct RenderEngine *engine, struct R } \ } -#define GPENCIL_3D_DRAWMODE(gpd) \ - ((gpd) && (gpd->draw_mode == GP_DRAWMODE_3D) && (gpd->xray_mode == GP_XRAY_3DSPACE)) +#define GPENCIL_3D_DRAWMODE(ob, gpd) \ + ((gpd) && (gpd->draw_mode == GP_DRAWMODE_3D) && (ob->dtx & OB_DRAWXRAY)) #define GPENCIL_USE_SOLID(stl) \ ((stl) && ((stl->storage->is_render) || (stl->storage->is_mat_preview))) |