diff options
| author | Antonioya <blendergit@gmail.com> | 2019-04-03 20:58:32 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-04-03 20:58:49 +0300 |
| commit | aa0bb47576262b909183947815d7f626df82b35d (patch) | |
| tree | 7113464b0ffdaa36a3323d1f0f7ad9331d5b41be /source/blender/draw | |
| parent | 322abc14285e7722d98d4503c09d032cf2b22f6c (diff) | |
Fix T63257: Grease Pencil renders incorrectly when in edit-mode
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_engine.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_shader_fx.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 384f25ecaa5..1cc493dd8f5 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -550,7 +550,7 @@ static void gpencil_add_draw_data(void *vedata, Object *ob) if (!cache_ob->is_dup_ob) { /* fill shading groups */ - if (!is_multiedit) { + if ((!is_multiedit) || (stl->storage->is_render)) { DRW_gpencil_populate_datablock(&e_data, vedata, ob, cache_ob); } else { diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c index b1bc796bfa7..1d1fe20aba9 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c +++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c @@ -58,7 +58,9 @@ static bool effect_is_active(bGPdata *gpd, ShaderFxData *fx, bool is_render) } bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd); - if (((fx->mode & eShaderFxMode_Editmode) == 0) && (is_edit)) { + if (((fx->mode & eShaderFxMode_Editmode) == 0) && + (is_edit) && (!is_render)) + { return false; } |