[Bf-blender-cvs] [84825e4b50c] blender-v2.82-release: Fix T72957 Crash using Eye dropper in Edit mode with X-ray

Clément Foucault noreply at git.blender.org
Mon Jan 13 17:31:07 CET 2020


Commit: 84825e4b50c19bfbb081499129d7cb4fd4ba1cdf
Author: Clément Foucault
Date:   Mon Jan 13 16:53:40 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB84825e4b50c19bfbb081499129d7cb4fd4ba1cdf

Fix T72957 Crash using Eye dropper in Edit mode with X-ray

===================================================================

M	source/blender/draw/engines/overlay/overlay_engine.c

===================================================================

diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c
index 50e2589c7e3..56b9ed8f54a 100644
--- a/source/blender/draw/engines/overlay/overlay_engine.c
+++ b/source/blender/draw/engines/overlay/overlay_engine.c
@@ -412,6 +412,11 @@ static void OVERLAY_draw_scene(void *vedata)
   OVERLAY_motion_path_draw(vedata);
   OVERLAY_extra_centers_draw(vedata);
 
+  if (DRW_state_is_select()) {
+    /* Edit modes have their own selection code. */
+    return;
+  }
+
   /* Functions after this point can change FBO freely. */
 
   switch (pd->ctx_mode) {



More information about the Bf-blender-cvs mailing list