[Bf-blender-cvs] [717530d] blender-v2.72-release: Cleanup to previous commit, we can reuse set_rgb instead of new function
Antony Riakiotakis
noreply at git.blender.org
Wed Oct 15 13:08:03 CEST 2014
Commit: 717530d2f591cc601e2df599721fcf290e4c550b
Author: Antony Riakiotakis
Date: Tue Oct 7 11:12:00 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rB717530d2f591cc601e2df599721fcf290e4c550b
Cleanup to previous commit, we can reuse set_rgb instead of new function
===================================================================
M source/blender/gpu/intern/gpu_material.c
M source/blender/gpu/shaders/gpu_shader_material.glsl
===================================================================
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index edb5b2a..75fed46 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -739,7 +739,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
i = is;
GPU_link(mat, "shade_visifac", i, visifac, shi->refl, &i);
- GPU_link(mat, "set_value_v3", GPU_dynamic_uniform(lamp->dyncol, GPU_DYNAMIC_LAMP_DYNCOL, lamp->ob), &lcol);
+ GPU_link(mat, "set_rgb", GPU_dynamic_uniform(lamp->dyncol, GPU_DYNAMIC_LAMP_DYNCOL, lamp->ob), &lcol);
shade_light_textures(mat, lamp, &lcol);
GPU_link(mat, "shade_mul_value_v3", GPU_dynamic_uniform(&lamp->dynenergy, GPU_DYNAMIC_LAMP_DYNENERGY, lamp->ob), lcol, &lcol);
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 1caa154..23716c8 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -385,11 +385,6 @@ void set_value(float val, out float outval)
outval = val;
}
-void set_value_v3(vec3 val, out vec3 outval)
-{
- outval = val;
-}
-
void set_rgb(vec3 col, out vec3 outcol)
{
outcol = col;
More information about the Bf-blender-cvs
mailing list