[Bf-blender-cvs] [3701305e877] greasepencil-refactor: GPencil: Refactor: Add quick 3D/2D stroke ordering for testing

Clément Foucault noreply at git.blender.org
Mon Dec 9 02:30:46 CET 2019


Commit: 3701305e87789bf22e415f8f3cb967fa6eca52c5
Author: Clément Foucault
Date:   Mon Dec 9 02:16:40 2019 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB3701305e87789bf22e415f8f3cb967fa6eca52c5

GPencil: Refactor: Add quick 3D/2D stroke ordering for testing

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

M	source/blender/draw/engines/gpencil/gpencil_cache_utils.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index 194f7d40845..9b753d442f9 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -54,13 +54,17 @@ GPENCIL_tObject *gpencil_object_cache_add_new(GPENCIL_PrivateData *pd, Object *U
 
 /* TODO remove the _new suffix. */
 GPENCIL_tLayer *gpencil_layer_cache_add_new(GPENCIL_PrivateData *pd,
-                                            Object *UNUSED(ob),
+                                            Object *ob,
                                             bGPDlayer *UNUSED(layer))
 {
-  // bGPdata *gpd = (bGPdata *)ob->data;
+  bGPdata *gpd = (bGPdata *)ob->data;
   GPENCIL_tLayer *tgp_layer = BLI_memblock_alloc(pd->gp_layer_pool);
 
-  DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL;
+  DRWState state = DRW_STATE_WRITE_COLOR;
+  /* TODO better 3D mode. */
+  if (GPENCIL_3D_DRAWMODE(ob, gpd)) {
+    state |= DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL;
+  }
   tgp_layer->geom_ps = DRW_pass_create("GPencil Layer", state);
 
   return tgp_layer;



More information about the Bf-blender-cvs mailing list