[Bf-blender-cvs] [1efd6f0bd28] greasepencil-refactor: GPencil: Refactor: Fix is_render flag
Clément Foucault
noreply at git.blender.org
Sat Jan 11 16:13:31 CET 2020
Commit: 1efd6f0bd28165684cbd132cd6d1fdf772e4ce4f
Author: Clément Foucault
Date: Sat Jan 11 16:12:48 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB1efd6f0bd28165684cbd132cd6d1fdf772e4ce4f
GPencil: Refactor: Fix is_render flag
This should fix VFX toggling for render mode only.
===================================================================
M source/blender/draw/engines/gpencil/gpencil_engine.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 779d7a12b1b..d6758f1f7bd 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -98,7 +98,7 @@ void GPENCIL_engine_init(void *ved)
stl->pd->draw_depth_only = !DRW_state_is_fbo() || (v3d && v3d->shading.type == OB_WIRE);
stl->pd->scene_depth_tx = stl->pd->draw_depth_only ? txl->dummy_texture : dtxl->depth;
stl->pd->scene_fb = dfbl->default_fb;
- stl->pd->is_render = true; /* TODO */
+ stl->pd->is_render = txl->render_depth_tx || (v3d && v3d->shading.type == OB_RENDER);
stl->pd->global_light_pool = gpencil_light_pool_add(stl->pd);
stl->pd->shadeless_light_pool = gpencil_light_pool_add(stl->pd);
/* Small HACK: we don't want the global pool to be reused,
More information about the Bf-blender-cvs
mailing list