[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11785] branches/soc-2007-maike/source/ blender: Added pointer to material to GLSL_MaterialTree structure as for nodes the base material might not be used in calculations

[Miguel Torres Lima]

Revision: 11785
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11785
Author:   maike
Date:     2007-08-22 18:15:17 +0200 (Wed, 22 Aug 2007)

Log Message:
-----------
Added pointer to material to GLSL_MaterialTree structure as for nodes the base material might not be used in calculations

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/include/BIF_glsl_materialtree.h
    branches/soc-2007-maike/source/blender/src/glsl_materialtree.c

Modified: branches/soc-2007-maike/source/blender/include/BIF_glsl_materialtree.h
===================================================================
--- branches/soc-2007-maike/source/blender/include/BIF_glsl_materialtree.h	2007-08-22 16:13:18 UTC (rev 11784)
+++ branches/soc-2007-maike/source/blender/include/BIF_glsl_materialtree.h	2007-08-22 16:15:17 UTC (rev 11785)
@@ -12,6 +12,7 @@
 struct GLSL_ColorBand_;
 struct GLSL_Texture_;
 struct GLSL_Material_;
+struct Material;
 
 /* ------------------------------------------------ */
 
@@ -20,6 +21,7 @@
   struct GLSL_Program_ *shaded_program;     /* pointer to GLSL_Program structure for shaded mode */
   
   struct GHash *hash;
+  struct Material *mat;
   
   void (*add_material)(struct GLSL_MaterialTree_ * tree, struct Material *mat);
   void (*del_material)(struct GLSL_MaterialTree_ * tree, struct Material *mat);
@@ -35,6 +37,7 @@
   void (*free)(struct GLSL_MaterialTree_ * tree);
   
   short type;
+  short exec;
 };
 
 /* ----------------------------------------------- */

Modified: branches/soc-2007-maike/source/blender/src/glsl_materialtree.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_materialtree.c	2007-08-22 16:13:18 UTC (rev 11784)
+++ branches/soc-2007-maike/source/blender/src/glsl_materialtree.c	2007-08-22 16:15:17 UTC (rev 11785)
@@ -178,6 +178,7 @@
 
   tree->shaded_program = NULL;
   tree->type = type;
+  tree->mat = mat;
   tree->hash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
   
   tree->add_material = glsl_tree_add_mat;