[Bf-blender-cvs] [a4afeeadeab] greasepencil-object: Add volumetric shader

Antonio Vazquez noreply at git.blender.org
Tue Apr 11 16:33:00 CEST 2017


Commit: a4afeeadeab8d6b4ac2cdd2c9ab26e9bdcebddf8
Author: Antonio Vazquez
Date:   Tue Apr 11 11:23:51 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa4afeeadeab8d6b4ac2cdd2c9ab26e9bdcebddf8

Add volumetric shader

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

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

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_mode.c b/source/blender/draw/engines/gpencil/gpencil_mode.c
index e0ffaba1575..6e5dec548e6 100644
--- a/source/blender/draw/engines/gpencil/gpencil_mode.c
+++ b/source/blender/draw/engines/gpencil/gpencil_mode.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor(s): Blender Institute
+ * Contributor(s): Antonio Vazquez
  *
  */
 
@@ -93,6 +93,7 @@ static struct {
 	struct GPUShader *gpencil_fill_sh;
 	struct GPUShader *gpencil_stroke_sh;
 	struct GPUShader *gpencil_point_sh;
+	struct GPUShader *gpencil_volumetric_sh;
 } e_data = {NULL}; /* Engine data */
 
 /* *********** FUNCTIONS *********** */
@@ -112,6 +113,8 @@ static void GPENCIL_engine_init(void *vedata)
 												 NULL);
 	e_data.gpencil_point_sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
 
+	e_data.gpencil_volumetric_sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR);
+
 	if (!stl->storage) {
 		stl->storage = MEM_callocN(sizeof(GPENCIL_Storage), "GPENCIL_Storage");
 	}




More information about the Bf-blender-cvs mailing list