[Bf-blender-cvs] [b2c81c5d431] blender2.8: DRW: Remove unused material uniforms.

Clément Foucault noreply at git.blender.org
Mon Jan 22 00:14:44 CET 2018


Commit: b2c81c5d431796448dbaf4096df80df4b032dd60
Author: Clément Foucault
Date:   Sun Jan 21 18:17:59 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBb2c81c5d431796448dbaf4096df80df4b032dd60

DRW: Remove unused material uniforms.

This might have some consequences but in my testing I did not found any.

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 9fe8145f6b3..4ed9205bcae 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -817,16 +817,10 @@ DRWShadingGroup *DRW_shgroup_material_create(struct GPUMaterial *material, DRWPa
 		else {
 			switch (input->type) {
 				case GPU_FLOAT:
-					DRW_shgroup_uniform_float(grp, input->shadername, (float *)input->dynamicvec, 1);
-					break;
 				case GPU_VEC2:
-					DRW_shgroup_uniform_vec2(grp, input->shadername, (float *)input->dynamicvec, 1);
-					break;
 				case GPU_VEC3:
-					DRW_shgroup_uniform_vec3(grp, input->shadername, (float *)input->dynamicvec, 1);
-					break;
 				case GPU_VEC4:
-					DRW_shgroup_uniform_vec4(grp, input->shadername, (float *)input->dynamicvec, 1);
+					/* Should already be in the material ubo. */
 					break;
 				case GPU_MAT3:
 					DRW_shgroup_uniform_mat3(grp, input->shadername, (float *)input->dynamicvec);



More information about the Bf-blender-cvs mailing list