[Bf-blender-cvs] [a1bd78b4881] master: Add missing draw state check to OVERLAY_edit_mesh_draw

Robert Guetzkow noreply at git.blender.org
Wed Dec 11 13:06:05 CET 2019


Commit: a1bd78b4881ba7b8c3962b83be1a9d7a67aeacca
Author: Robert Guetzkow
Date:   Wed Dec 11 13:37:10 2019 +0100
Branches: master
https://developer.blender.org/rBa1bd78b4881ba7b8c3962b83be1a9d7a67aeacca

Add missing draw state check to OVERLAY_edit_mesh_draw

Fix for T72309. The crash was caused by a missing check of the draw state, which resulted in dereferencing of a null pointer.

Reviewed By: fclem

Differential Revision: https://developer.blender.org/D6380

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

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

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

diff --git a/source/blender/draw/engines/overlay/overlay_edit_mesh.c b/source/blender/draw/engines/overlay/overlay_edit_mesh.c
index c8f98702e60..56fbc3cca01 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_mesh.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_mesh.c
@@ -360,7 +360,9 @@ void OVERLAY_edit_mesh_draw(OVERLAY_Data *vedata)
   OVERLAY_PrivateData *pd = vedata->stl->pd;
   OVERLAY_FramebufferList *fbl = vedata->fbl;
 
-  GPU_framebuffer_bind(fbl->overlay_default_fb);
+  if (DRW_state_is_fbo()) {
+    GPU_framebuffer_bind(fbl->overlay_default_fb);
+  }
 
   DRW_draw_pass(psl->edit_mesh_weight_ps);
   DRW_draw_pass(psl->edit_mesh_analysis_ps);



More information about the Bf-blender-cvs mailing list