[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11432] branches/soc-2007-maike/release/ glsl/material_return.gsl: Correction for when diffuse lighting or specular lighting are deactivated for colorband calculation

[Miguel Torres Lima]

Revision: 11432
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11432
Author:   maike
Date:     2007-07-30 20:10:21 +0200 (Mon, 30 Jul 2007)

Log Message:
-----------
Correction for when diffuse lighting or specular lighting are deactivated for colorband calculation

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-07-30 18:02:33 UTC (rev 11431)
+++ branches/soc-2007-maike/release/glsl/material_return.gsl	2007-07-30 18:10:21 UTC (rev 11432)
@@ -1,3 +1,4 @@
+#ifdef CALC_DIFFUSE
 #ifdef DIFF_CB_RESULT
 #ifndef LIGHT_CALCULATIONS
 return(vec3(0.0, 0.0, 0.0));
@@ -7,24 +8,27 @@
 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));
 diff_rslt = (DIFF_CB_BLEND_FUNC(diff_cb_rslt_tex.rgb, diff_rslt.rgb, DIFF_CB_FAC * diff_cb_rslt_tex.a));
+#ifdef CALC_SPECULAR
 #ifdef SPEC_CB_RESULT
 float spec_cb_rslt_fac = (0.3 * spec_rslt.r + 0.58 * spec_rslt.g + 0.12 * spec_rslt.b);
 vec4 spec_cb_rslt_tex = texture1D(SPEC_CB_TEX, clamp(spec_cb_rslt_fac, 0.0, 0.999));
 spec_rslt = (SPEC_CB_BLEND_FUNC(spec_cb_rslt_tex.rgb, spec_rslt.rgb, SPEC_CB_FAC * spec_cb_rslt_tex.a));
 diff_rslt += spec_rslt;
 #endif
+#endif
 return(diff_rslt);}
 #endif
 #endif
+#endif
 
-
+#ifdef CALC_SPECULAR
 #ifdef SPEC_CB_RESULT
 float spec_cb_rslt_fac = (0.3 * spec_rslt.r + 0.58 * spec_rslt.g + 0.12 * spec_rslt.b);
 vec4 spec_cb_rslt_tex = texture1D(SPEC_CB_TEX, clamp(spec_cb_rslt_fac, 0.0, 0.999));
 spec_rslt = (SPEC_CB_BLEND_FUNC(spec_cb_rslt_tex.rgb, spec_rslt.rgb, SPEC_CB_FAC * spec_cb_rslt_tex.a));
 #endif
+#endif
 
-
 #ifdef LIGHT_CALCULATIONS
   return(amb_exp * (1.0 - exp((diff_rslt + (diff_color * emit))* amb_range)) + spec_rslt + amb_rslt); 
 #else