blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

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

Only must fade if the active object is a GPencil.
This commit is contained in:
Antonio Vazquez 2020-03-26 13:17:11 +01:00
parent a093112696
commit 622e1591da
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/engines/gpencil/gpencil_engine.c
View File

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