diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-03-26 15:17:11 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-03-26 15:17:22 +0300 |
| commit | 622e1591dac77d42d07ae65e7436b4e0a1e627fe (patch) | |
| tree | 5c2aac444c96b064fc8b59d0663d194a35582573 /source/blender/draw | |
| parent | a093112696685c160e71a5b51eb8cc3454eaa4b4 (diff) | |
GPencil: Fix unreported fade object when no Gpencil object is selected
Only must fade if the active object is a GPencil.
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_engine.c | 3 |
1 files changed, 2 insertions, 1 deletions
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. */ |