[Bf-blender-cvs] [839f0cfa41f] master: Overlay: Fix crash caused by NULL passes
Clément Foucault
noreply at git.blender.org
Thu Mar 26 19:18:47 CET 2020
Commit: 839f0cfa41f2f209774b3a7d222529954a788466
Author: Clément Foucault
Date: Thu Mar 26 19:16:45 2020 +0100
Branches: master
https://developer.blender.org/rB839f0cfa41f2f209774b3a7d222529954a788466
Overlay: Fix crash caused by NULL passes
===================================================================
M source/blender/draw/engines/overlay/overlay_antialiasing.c
===================================================================
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;
More information about the Bf-blender-cvs
mailing list