[Bf-blender-cvs] [6d479b4d2bb] greasepencil-refactor: GPencil: Refactor: Fix crash in vertex paint mode

Clément Foucault noreply at git.blender.org
Tue Jan 7 15:48:38 CET 2020


Commit: 6d479b4d2bb12091aa8cefc06023167cbf678929
Author: Clément Foucault
Date:   Tue Jan 7 15:48:25 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB6d479b4d2bb12091aa8cefc06023167cbf678929

GPencil: Refactor: Fix crash in vertex paint mode

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

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

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

diff --git a/source/blender/draw/engines/overlay/overlay_gpencil.c b/source/blender/draw/engines/overlay/overlay_gpencil.c
index 2c56d3ba7dd..d7b17c6b9b8 100644
--- a/source/blender/draw/engines/overlay/overlay_gpencil.c
+++ b/source/blender/draw/engines/overlay/overlay_gpencil.c
@@ -47,6 +47,7 @@ void OVERLAY_edit_gpencil_cache_init(OVERLAY_Data *vedata)
   /* Default: Display nothing. */
   pd->edit_gpencil_points_grp = NULL;
   pd->edit_gpencil_wires_grp = NULL;
+  psl->edit_gpencil_ps = NULL;
 
   /* REFACTOR(fclem) remove */
   if (G.debug_value != 50) {
@@ -233,10 +234,7 @@ void OVERLAY_edit_gpencil_draw(OVERLAY_Data *vedata)
 {
   OVERLAY_PassList *psl = vedata->psl;
 
-  /* REFACTOR(fclem) remove */
-  if (G.debug_value != 50) {
-    return;
+  if (psl->edit_gpencil_ps) {
+    DRW_draw_pass(psl->edit_gpencil_ps);
   }
-
-  DRW_draw_pass(psl->edit_gpencil_ps);
 }



More information about the Bf-blender-cvs mailing list