[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11336] branches/soc-2007-maike/source/ blender/src: Shadeless bugfix

[Miguel Torres Lima]

Revision: 11336
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11336
Author:   maike
Date:     2007-07-22 19:02:42 +0200 (Sun, 22 Jul 2007)

Log Message:
-----------
Shadeless bugfix

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/src/glsl_colorband.c
    branches/soc-2007-maike/source/blender/src/glsl_drawobject.c
    branches/soc-2007-maike/source/blender/src/glsl_material_node.c

Modified: branches/soc-2007-maike/source/blender/src/glsl_colorband.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_colorband.c	2007-07-22 16:55:09 UTC (rev 11335)
+++ branches/soc-2007-maike/source/blender/src/glsl_colorband.c	2007-07-22 17:02:42 UTC (rev 11336)
@@ -115,7 +115,6 @@
     }
 
   glsl_colorband_create_tex(mat);
-  glsl_update_mat_colorband_uniforms(mat);
   glsl_redo_mat_program(material);
 }
 

Modified: branches/soc-2007-maike/source/blender/src/glsl_drawobject.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_drawobject.c	2007-07-22 16:55:09 UTC (rev 11335)
+++ branches/soc-2007-maike/source/blender/src/glsl_drawobject.c	2007-07-22 17:02:42 UTC (rev 11336)
@@ -357,9 +357,10 @@
     
     if(mat && mat->mode & MA_SHLESS){
       glUseProgram(0);
+      glColor4f(mat->r, mat->g, mat->b, mat->alpha);
     }
     
-    if(!oldmat || mat != oldmat){
+    else if(!oldmat || mat != oldmat){
       if(!mat)
 	mat = &defmaterial;
  
@@ -371,7 +372,6 @@
       else{
 	program = glsl_get_material_program(mat, GLSL_TEXTURED);
       }
-      glsl_update_colorband_uniforms(program->program, mat, 0);
       glUseProgram(program->program);
       glsl_light_uniforms(program->program, ob);
       oldmat = mat;

Modified: branches/soc-2007-maike/source/blender/src/glsl_material_node.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_material_node.c	2007-07-22 16:55:09 UTC (rev 11335)
+++ branches/soc-2007-maike/source/blender/src/glsl_material_node.c	2007-07-22 17:02:42 UTC (rev 11336)
@@ -70,7 +70,7 @@
 		     0, "uniform float u_mat_", GINT, num, 0, "_spec3;\n",
 		     0, "uniform float u_mat_", GINT, num, 0, "_amb_fac;\n",
 		     0, "uniform float u_mat_", GINT, num, 0, "_emit;\n",
-		     0, "uniform int u_mat_", GINT, num, 0, "_hard;\n");
+		     0, "uniform float u_mat_", GINT, num, 0, "_hard;\n");
 
   return code;
 }