[Bf-blender-cvs] [15f5457502a] blender2.8: Draw Manager: Use defines instead of hardcoded enum values
Dalai Felinto
noreply at git.blender.org
Fri Jul 7 12:34:43 CEST 2017
Commit: 15f5457502ad7878d12f1368276cfa236914abf8
Author: Dalai Felinto
Date: Fri Jul 7 12:33:17 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB15f5457502ad7878d12f1368276cfa236914abf8
Draw Manager: Use defines instead of hardcoded enum values
===================================================================
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 1806f46156f..9ca3d30808b 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -750,22 +750,22 @@ DRWShadingGroup *DRW_shgroup_material_create(struct GPUMaterial *material, DRWPa
/* Floats */
else {
switch (input->type) {
- case 1:
+ case GPU_FLOAT:
DRW_shgroup_uniform_float(grp, input->shadername, (float *)input->dynamicvec, 1);
break;
- case 2:
+ case GPU_VEC2:
DRW_shgroup_uniform_vec2(grp, input->shadername, (float *)input->dynamicvec, 1);
break;
- case 3:
+ case GPU_VEC3:
DRW_shgroup_uniform_vec3(grp, input->shadername, (float *)input->dynamicvec, 1);
break;
- case 4:
+ case GPU_VEC4:
DRW_shgroup_uniform_vec4(grp, input->shadername, (float *)input->dynamicvec, 1);
break;
- case 9:
+ case GPU_MAT3:
DRW_shgroup_uniform_mat3(grp, input->shadername, (float *)input->dynamicvec);
break;
- case 16:
+ case GPU_MAT4:
DRW_shgroup_uniform_mat4(grp, input->shadername, (float *)input->dynamicvec);
break;
default:
More information about the Bf-blender-cvs
mailing list