From 622e1591dac77d42d07ae65e7436b4e0a1e627fe Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Thu, 26 Mar 2020 13:17:11 +0100 Subject: GPencil: Fix unreported fade object when no Gpencil object is selected Only must fade if the active object is a GPencil. --- source/blender/draw/engines/gpencil/gpencil_engine.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/draw') diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 7ffa02189e2..9ebd20eb539 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -905,7 +905,8 @@ void GPENCIL_draw_scene(void *ved) float clear_cols[2][4] = {{0.0f, 0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}; /* Fade 3D objects. */ - if ((!pd->is_render) && (pd->fade_3d_object_opacity > -1.0f)) { + if ((!pd->is_render) && (pd->fade_3d_object_opacity > -1.0f) && (pd->obact != NULL) && + (pd->obact->type == OB_GPENCIL)) { float background_color[3]; ED_view3d_background_color_get(pd->scene, pd->v3d, background_color); /* Blend color. */ -- cgit v1.2.3