[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11538] branches/soc-2007-maike/release/ glsl/material_return.gsl: Colorband with result as input vertex color bugfix

[Miguel Torres Lima]

Revision: 11538
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11538
Author:   maike
Date:     2007-08-10 18:56:19 +0200 (Fri, 10 Aug 2007)

Log Message:
-----------
Colorband with result as input vertex color bugfix

Modified Paths:
--------------
    branches/soc-2007-maike/release/glsl/material_return.gsl

Modified: branches/soc-2007-maike/release/glsl/material_return.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/material_return.gsl	2007-08-10 16:35:37 UTC (rev 11537)
+++ branches/soc-2007-maike/release/glsl/material_return.gsl	2007-08-10 16:56:19 UTC (rev 11538)
@@ -4,7 +4,7 @@
 return(vec3(0.0, 0.0, 0.0));
 #else
 if(diff_cb_res > 0.0){
-  diff_rslt = amb_exp * (1.0 - exp((diff_rslt + (diff_color * emit))* amb_range)) + spec_rslt + amb_rslt;
+  diff_rslt = amb_exp * (1.0 - exp((diff_rslt + (diff_color * vec3(emit + vert_color.r, emit + vert_color.g, emit + vert_color.b)))* amb_range)) + spec_rslt + amb_rslt;
   if(diff_rslt.r >= 0.005 || diff_rslt.g >= 0.005 || diff_rslt.b >= 0.005){
     float diff_cb_rslt_fac = (0.3 * diff_rslt.r + 0.58 * diff_rslt.g + 0.12 * diff_rslt.b);
     vec4 diff_cb_rslt_tex = texture1D(DIFF_CB_TEX, clamp(diff_cb_rslt_fac, 0.0, 0.999));
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef LIGHT_CALCULATIONS
-  return(amb_exp * (1.0 - exp((diff_rslt + (diff_color * vec3(emit + vert_color.r, emit + vert_color.g, emit + vert_color.b)))* amb_range)) + spec_rslt + amb_rslt); 
+  return(amb_exp * (1.0 - exp((diff_rslt + (diff_color * vec3(emit + vert_color.r, emit + vert_color.g, emit + vert_color.b))) * amb_range)) + spec_rslt + amb_rslt); 
 #else
   return(vec3(0.0, 0.0, 0.0));
 #endif