[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11600] branches/soc-2007-maike/source/ blender/src: Added texture uniform function calls

[Miguel Torres Lima]

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

Log Message:
-----------
Added texture uniform function calls

Modified Paths:
--------------
    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/glsl_texture.c

Modified: branches/soc-2007-maike/source/blender/src/glsl_material.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_material.c	2007-08-14 16:46:07 UTC (rev 11599)
+++ branches/soc-2007-maike/source/blender/src/glsl_material.c	2007-08-14 16:47:19 UTC (rev 11600)
@@ -211,6 +211,7 @@
 
   glsl_update_mat_material_uniforms(material->mat);
   glsl_update_mat_colorband_uniforms(material->mat);
+  glsl_update_mat_texture_uniforms(material->mat);
   glsl_update_material_world_uniforms(material->mat);
 }
 

Modified: branches/soc-2007-maike/source/blender/src/glsl_materialtree.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_materialtree.c	2007-08-14 16:46:07 UTC (rev 11599)
+++ branches/soc-2007-maike/source/blender/src/glsl_materialtree.c	2007-08-14 16:47:19 UTC (rev 11600)
@@ -207,6 +207,7 @@
   glsl_update_tree_material_uniforms(tree);
   glsl_update_tree_colorband_uniforms(tree);
   glsl_update_tree_world_uniforms(tree);
+  glsl_update_tree_texture_uniforms(tree);
   glsl_update_all_light_uniforms(tree);
 
   if(mat == &defmaterial)
@@ -237,6 +238,7 @@
 
   glsl_update_all_material_uniforms();
   glsl_update_all_colorband_uniforms();
+  glsl_update_all_texture_uniforms();
   glsl_update_all_world_uniforms();
 }
 

Modified: branches/soc-2007-maike/source/blender/src/glsl_texture.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_texture.c	2007-08-14 16:46:07 UTC (rev 11599)
+++ branches/soc-2007-maike/source/blender/src/glsl_texture.c	2007-08-14 16:47:19 UTC (rev 11600)
@@ -164,6 +164,7 @@
 	material->redo_prog(material);
 	break;
       case B_MAT_MAPTO_UNIFS:
+	glsl_update_mat_texture_uniforms(mat);
 	printf("\nGLSL Texture Mapping Uniforms changed.\n");
 	break;
       case B_MAT_MAPTO_BLEND:
@@ -183,18 +184,23 @@
     switch(event)
       {
       case B_MAT_MAPIN_COORDS:
+	glsl_update_mat_texture_uniforms(mat);
 	printf("\nGLSL Texture Input Coords changed.\n");
 	break;
       case B_MAT_MAPIN_MAP:
+	glsl_update_mat_texture_uniforms(mat);
 	printf("\nGLSL Texture Input Mapping changed.\n");
 	break;
       case B_MAT_MAPIN_AXIS:
+	glsl_update_mat_texture_uniforms(mat);
 	printf("\nGLSL Texture Input Axis changed.\n");
 	break;
       case B_MAT_MAPIN_OFS:
+	glsl_update_mat_texture_uniforms(mat);
 	printf("\nGLSL Texture Offset changed.\n");
 	break;
       case B_MAT_MAPIN_SIZE:
+	glsl_update_mat_texture_uniforms(mat);
 	printf("\nGLSL Texture Size changed.\n");
 	break;
     }
@@ -215,6 +221,7 @@
 
 void glsl_texture_update_value(Material *mat, int index)
 {
+  glsl_update_mat_texture_uniforms(mat);
   printf("\nGLSL Texture value param changed.\n");
 }