[Bf-blender-cvs] [622e1591dac] master: GPencil: Fix unreported fade object when no Gpencil object is selected

[Antonio Vazquez]

Commit: 622e1591dac77d42d07ae65e7436b4e0a1e627fe
Author: Antonio Vazquez
Date:   Thu Mar 26 13:17:11 2020 +0100
Branches: master
https://developer.blender.org/rB622e1591dac77d42d07ae65e7436b4e0a1e627fe

GPencil: Fix unreported fade object when no Gpencil object is selected

Only must fade if the active object is a GPencil.

===================================================================

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 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. */