[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11872] branches/soc-2007-maike/source/ blender: Removed unnecessary parameter from colorband texture creation function

[Miguel Torres Lima]

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

Log Message:
-----------
Removed unnecessary parameter from colorband texture creation function

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/include/BIF_glsl_colorband.h
    branches/soc-2007-maike/source/blender/src/glsl_colorband.c
    branches/soc-2007-maike/source/blender/src/glsl_material.c
    branches/soc-2007-maike/source/blender/src/glsl_materialtree.c
    branches/soc-2007-maike/source/blender/src/glutil.c

Modified: branches/soc-2007-maike/source/blender/include/BIF_glsl_colorband.h
===================================================================
--- branches/soc-2007-maike/source/blender/include/BIF_glsl_colorband.h	2007-08-28 15:19:32 UTC (rev 11871)
+++ branches/soc-2007-maike/source/blender/include/BIF_glsl_colorband.h	2007-08-28 16:19:18 UTC (rev 11872)
@@ -24,7 +24,7 @@
 
   short tex_set;
   
-  void (*add_tex)(struct GLSL_ColorBand_ *colorband, int index, short type);
+  void (*add_tex)(struct GLSL_ColorBand_ *colorband, int index);
   void (*free)(struct GLSL_ColorBand_ *colorband);
 };
 

Modified: branches/soc-2007-maike/source/blender/src/glsl_colorband.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_colorband.c	2007-08-28 15:19:32 UTC (rev 11871)
+++ branches/soc-2007-maike/source/blender/src/glsl_colorband.c	2007-08-28 16:19:18 UTC (rev 11872)
@@ -46,7 +46,7 @@
 /* ------------------------------------------------------------------------------- */
 
 
-static void glsl_cb_add_tex(GLSL_ColorBand colorband, int index, short type)
+static void glsl_cb_add_tex(GLSL_ColorBand colorband, int index)
 {
   float texels[4];
   ColorBand *cb = colorband->colorband;

Modified: branches/soc-2007-maike/source/blender/src/glsl_material.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_material.c	2007-08-28 15:19:32 UTC (rev 11871)
+++ branches/soc-2007-maike/source/blender/src/glsl_material.c	2007-08-28 16:19:18 UTC (rev 11872)
@@ -120,7 +120,7 @@
 
 static void glsl_mat_add_diff_cb(GLSL_Material material, Material *mat)
 {
-  if(!material->diff_ramp){
+  if(!material->diff_ramp && mat->mode & MA_RAMP_COL){
     material->diff_ramp = glsl_init_colorband(mat, mat->ramp_col);
     material->tex_diff_cb(material);
   }
@@ -129,7 +129,7 @@
 
 static void glsl_mat_add_spec_cb(GLSL_Material material, Material *mat)
 {
-  if(!material->spec_ramp){
+  if(!material->spec_ramp && mat->mode & MA_RAMP_SPEC){
     material->spec_ramp = glsl_init_colorband(mat, mat->ramp_spec);
     material->tex_spec_cb(material);
   }
@@ -158,7 +158,7 @@
 {
   GLSL_ColorBand colorband = material->diff_ramp;
 
-  colorband->add_tex(colorband, colorband->index, 1);
+  colorband->add_tex(colorband, colorband->index);
 }
 
 
@@ -166,7 +166,7 @@
 {
   GLSL_ColorBand colorband = material->spec_ramp;
 
-  colorband->add_tex(colorband, colorband->index, 2);
+  colorband->add_tex(colorband, colorband->index);
 }
 
 

Modified: branches/soc-2007-maike/source/blender/src/glsl_materialtree.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_materialtree.c	2007-08-28 15:19:32 UTC (rev 11871)
+++ branches/soc-2007-maike/source/blender/src/glsl_materialtree.c	2007-08-28 16:19:18 UTC (rev 11872)
@@ -248,9 +248,8 @@
 {
   GLSL_MaterialTree tree = (struct GLSL_MaterialTree_ *) BLI_ghash_lookup(treeHash, mat);
 
-  if(!tree || !mat){
+  if(mat == &defmaterial || !tree || !mat)
     return glsl_defmaterial->shaded_program;
-  }
 
   return((struct GLSL_Program_ *) tree->shaded_program);
 }

Modified: branches/soc-2007-maike/source/blender/src/glutil.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glutil.c	2007-08-28 15:19:32 UTC (rev 11871)
+++ branches/soc-2007-maike/source/blender/src/glutil.c	2007-08-28 16:19:18 UTC (rev 11872)
@@ -875,33 +875,20 @@
   Object *obj;
     
   for(base= G.scene->base.first; base; base= base->next) {
-    if(glsl_active()){
-      obj = base->object;
-      
-      if(obj->type == OB_LAMP){
-	glsl_create_light((Lamp *) obj->data, obj);
-      }
+    obj = base->object;
+    
+    if(obj->type == OB_LAMP){
+      glsl_create_light((Lamp *) obj->data, obj);
     }
-    else{
-      glsl_free_all();
-      return;
-    }
   }
  
-  if(glsl_active())
-    glsl_create_materialtree(&defmaterial, GLSL_MAT);
+  glsl_create_materialtree(&defmaterial, GLSL_MAT);
 
   for(base= G.scene->base.first; base; base= base->next) {
-    if(glsl_active()){
-      obj = base->object;
-      
-      if(base->lay & G.scene->lay && obj->type != OB_LAMP && obj->type != OB_CAMERA){
-	glsl_query_material(obj);
-      }  
-    }
-    else{
-      glsl_free_all();
-      return;
-    }
+    obj = base->object;
+    
+    if(base->lay & G.scene->lay && obj->type != OB_LAMP && obj->type != OB_CAMERA){
+      glsl_query_material(obj);
+    }  
   }
 }