[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11433] branches/soc-2007-maike/release/ glsl: Changed #undef CALC_DIFFUSE and CALC_SPEC place for colorband result

[Miguel Torres Lima]

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

Log Message:
-----------
Changed #undef CALC_DIFFUSE and CALC_SPEC place for colorband result

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

Modified: branches/soc-2007-maike/release/glsl/light_calc.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/light_calc.gsl	2007-07-30 18:10:21 UTC (rev 11432)
+++ branches/soc-2007-maike/release/glsl/light_calc.gsl	2007-07-30 18:27:11 UTC (rev 11433)
@@ -63,8 +63,6 @@
 
 #undef VISIBILITY
 #undef LIGHT_ID
-#undef CALC_DIFFUSE
-#undef CALC_SPECULAR
 #undef DIFF_SHADER_ID
 #undef SPEC_SHADER_ID
 #undef HEMI

Modified: branches/soc-2007-maike/release/glsl/material_return.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/material_return.gsl	2007-07-30 18:10:21 UTC (rev 11432)
+++ branches/soc-2007-maike/release/glsl/material_return.gsl	2007-07-30 18:27:11 UTC (rev 11433)
@@ -35,7 +35,8 @@
   return(vec3(0.0, 0.0, 0.0));
 #endif
 
-
+#undef CALC_DIFFUSE
+#undef CALC_SPECULAR
 #undef DIFF_CB_TYPE
 #undef SPEC_CB_TYPE
 #undef DIFF_CB_BLEND_FUNC