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/editors/gpencil | |
| 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/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/annotate_paint.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index 5e1e33aa9be..a9654e50822 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -1188,9 +1188,6 @@ static bool gp_session_initdata(bContext *C, tGPsdata *p) /* mark datablock as being used for annotations */ gpd->flag |= GP_DATA_ANNOTATIONS; - - /* annotations always in front of all objects */ - gpd->xray_mode = GP_XRAY_FRONT; } p->gpd = *gpd_ptr; } diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index b36929f66b0..8551dc6f981 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -721,7 +721,7 @@ static void gp_draw_stroke_3d(tGPDdraw *tgpw, short thickness, const float ink[4 immUniform1i("keep_size", keep_size); immUniform1i("pixfactor", tgpw->gpd->pixfactor); /* xray mode always to 3D space to avoid wrong zdepth calculation (T60051) */ - immUniform1i("xraymode", GP_XRAY_3DSPACE); + immUniform1i("xraymode", 1); /* draw stroke curve */ GPU_line_width(max_ff(curpressure * thickness, 1.0f)); |