Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-03-26 21:16:45 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-03-26 21:16:57 +0300
commit839f0cfa41f2f209774b3a7d222529954a788466 (patch)
treedd047b469b1bc7c51a6f0587c24caafb0ad810df /source/blender/draw
parent86c61ce64f6e8c921d8770fcd42ed2c21d01ca3a (diff)
Overlay: Fix crash caused by NULL passes
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/overlay/overlay_antialiasing.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_antialiasing.c b/source/blender/draw/engines/overlay/overlay_antialiasing.c
index e13d27032d5..efd2f6588ba 100644
--- a/source/blender/draw/engines/overlay/overlay_antialiasing.c
+++ b/source/blender/draw/engines/overlay/overlay_antialiasing.c
@@ -183,9 +183,11 @@ void OVERLAY_antialiasing_cache_finish(OVERLAY_Data *vedata)
GPU_ATTACHMENT_TEXTURE(txl->overlay_line_tx)});
}
- pd->antialiasing.do_depth_copy = !DRW_pass_is_empty(psl->wireframe_ps) ||
+ pd->antialiasing.do_depth_copy = !(psl->wireframe_ps == NULL ||
+ DRW_pass_is_empty(psl->wireframe_ps)) ||
(pd->xray_enabled && pd->xray_opacity > 0.0f);
- pd->antialiasing.do_depth_infront_copy = !DRW_pass_is_empty(psl->wireframe_xray_ps);
+ pd->antialiasing.do_depth_infront_copy = !(psl->wireframe_xray_ps == NULL ||
+ DRW_pass_is_empty(psl->wireframe_xray_ps));
const bool do_wireframe = pd->antialiasing.do_depth_copy ||
pd->antialiasing.do_depth_infront_copy;