[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10850] branches/soc-2007-maike/source/ blender/blenkernel/intern/scene.c: Material -> GLSL Material Hash initialization

[Miguel Torres Lima]

Revision: 10850
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10850
Author:   maike
Date:     2007-06-01 18:54:07 +0200 (Fri, 01 Jun 2007)

Log Message:
-----------
Material -> GLSL Material Hash initialization
Defmaterial initialization
GLSL Material creation / deletion on material creation/deletion
Scene lights initialization on scene load

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/blenkernel/intern/scene.c

Modified: branches/soc-2007-maike/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2007-maike/source/blender/blenkernel/intern/scene.c	2007-06-01 16:53:55 UTC (rev 10849)
+++ branches/soc-2007-maike/source/blender/blenkernel/intern/scene.c	2007-06-01 16:54:07 UTC (rev 10850)
@@ -85,6 +85,9 @@
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
+#include "BIF_glsl_light.h"
+#include "BIF_glsl_util.h"
+
 #include "nla.h"
 
 #ifdef WIN32
@@ -270,6 +273,8 @@
 	
 	G.scene= sce;
 	
+	glsl_free_structs();
+
 	/* check for cyclic sets, for reading old files but also for definite security (py?) */
 	scene_check_setscene(G.scene);
 	
@@ -309,9 +314,12 @@
 		ob->flag= base->flag;
 		
 		ob->ctime= -1234567.0;	/* force ipo to be calculated later */
+
+		if(ob->type == OB_LAMP)
+		  glsl_init_scene_light(ob->data, ob);
+		else if(G.scene->lay & base->lay) glsl_query_material(ob);
 	}
 	/* no full animation update, this to enable render code to work (render code calls own animation updates) */
-	
 	/* do we need FRAMECHANGED in set_scene? */
 //	if (G.f & G_DOSCRIPTLINKS) BPY_do_all_scripts(SCRIPT_FRAMECHANGED);
 }
@@ -538,7 +546,7 @@
 		scene_update(sce, lay);
 
 	scene_update(scene, lay);
-	
+
 }
 
 /* return default layer, also used to patch old files */