[Bf-blender-cvs] [e6dd29ce6eb] blender-v2.83-release: Fix T75958 Overlay: Blender Crashes when selecting without Depth Picking
Clément Foucault
noreply at git.blender.org
Thu May 7 23:33:05 CEST 2020
Commit: e6dd29ce6ebfca2a66f0d5bb103dccfa43a03774
Author: Clément Foucault
Date: Thu May 7 18:02:55 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBe6dd29ce6ebfca2a66f0d5bb103dccfa43a03774
Fix T75958 Overlay: Blender Crashes when selecting without Depth Picking
===================================================================
M source/blender/draw/engines/overlay/overlay_wireframe.c
===================================================================
diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.c b/source/blender/draw/engines/overlay/overlay_wireframe.c
index 4749bfe1d48..63a1a72c9a6 100644
--- a/source/blender/draw/engines/overlay/overlay_wireframe.c
+++ b/source/blender/draw/engines/overlay/overlay_wireframe.c
@@ -73,8 +73,9 @@ void OVERLAY_wireframe_cache_init(OVERLAY_Data *vedata)
DRWState state = DRW_STATE_FIRST_VERTEX_CONVENTION | DRW_STATE_WRITE_COLOR |
DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL;
DRWPass *pass;
- GPUTexture **depth_tx = (pd->xray_enabled || pd->xray_opacity > 0.0f) ? &txl->temp_depth_tx :
- &txl->dummy_depth_tx;
+ GPUTexture **depth_tx = ((pd->xray_enabled || pd->xray_opacity > 0.0f) && DRW_state_is_fbo()) ?
+ &txl->temp_depth_tx :
+ &txl->dummy_depth_tx;
if (xray == 0) {
DRW_PASS_CREATE(psl->wireframe_ps, state | pd->clipping_state);
More information about the Bf-blender-cvs
mailing list