[Bf-blender-cvs] [0b73817c8cf] master: Add a new function to recover the next shading group.

Antonioya noreply at git.blender.org
Tue Jun 18 14:01:38 CEST 2019


Commit: 0b73817c8cf413f2ef3222221ca1d5a279e58515
Author: Antonioya
Date:   Tue Jun 18 14:00:19 2019 +0200
Branches: master
https://developer.blender.org/rB0b73817c8cf413f2ef3222221ca1d5a279e58515

Add a new function to recover the next shading group.

After talking with @fclem, we decided to keep this as a workaround function waiting for the clearing operation to be available inside the shgroups.

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

M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_manager_data.c

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

diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index d68525e62ae..aae1ad42860 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -531,6 +531,7 @@ void DRW_shgroup_uniform_float_copy(DRWShadingGroup *shgroup, const char *name,
 void DRW_shgroup_uniform_vec2_copy(DRWShadingGroup *shgroup, const char *name, const float *value);
 
 bool DRW_shgroup_is_empty(DRWShadingGroup *shgroup);
+DRWShadingGroup *DRW_shgroup_get_next(DRWShadingGroup *shgroup);
 
 /* Passes */
 DRWPass *DRW_pass_create(const char *name, DRWState state);
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 9c9b91eaaed..10d16021b27 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -996,6 +996,13 @@ bool DRW_shgroup_is_empty(DRWShadingGroup *shgroup)
   return shgroup->calls.first == NULL;
 }
 
+/* This is a workaround function waiting for the clearing operation to be available inside the
+ * shgroups. */
+DRWShadingGroup *DRW_shgroup_get_next(DRWShadingGroup *shgroup)
+{
+  return shgroup->next;
+}
+
 DRWShadingGroup *DRW_shgroup_create_sub(DRWShadingGroup *shgroup)
 {
   DRWShadingGroup *shgroup_new = BLI_memblock_alloc(DST.vmempool->shgroups);



More information about the Bf-blender-cvs mailing list