[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11843] branches/soc-2007-maike/source/ blender/blenkernel/intern: Removed firstdraw function as glsl init placement changed

[Miguel Torres Lima]

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

Log Message:
-----------
Removed firstdraw function as glsl init placement changed

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

Modified: branches/soc-2007-maike/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2007-maike/source/blender/blenkernel/intern/material.c	2007-08-27 16:16:08 UTC (rev 11842)
+++ branches/soc-2007-maike/source/blender/blenkernel/intern/material.c	2007-08-27 16:17:21 UTC (rev 11843)
@@ -166,7 +166,7 @@
 
 	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RADIO|MA_RAYBIAS|MA_TANGENT_STR;
 	
-	if(glsl_firstdraw())
+	if(glsl_active())
 	  glsl_create_materialtree(ma, GLSL_MAT);
 }
 

Modified: branches/soc-2007-maike/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2007-maike/source/blender/blenkernel/intern/scene.c	2007-08-27 16:16:08 UTC (rev 11842)
+++ branches/soc-2007-maike/source/blender/blenkernel/intern/scene.c	2007-08-27 16:17:21 UTC (rev 11843)
@@ -326,10 +326,7 @@
 
 	/* write programs  HERE */
 
-	if(!glsl_firstdraw()){
-	  glsl_init_firstdraw();
-	}
-	else if(glsl_active()){
+	if(glsl_active()){
 	  glsl_create_all();
 	}