[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30713] branches/soc-2010-moguri/source/ blender/blenloader/intern/readfile.c: The version bump to 253 messed with some of my readfile.c changes.

[Mitchell Stokes]

Revision: 30713
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30713
Author:   moguri
Date:     2010-07-25 10:45:19 +0200 (Sun, 25 Jul 2010)

Log Message:
-----------
The version bump to 253 messed with some of my readfile.c changes. In particular setting defaults for the geometry shader input and output.

Modified Paths:
--------------
    branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c

Modified: branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c	2010-07-25 08:38:13 UTC (rev 30712)
+++ branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c	2010-07-25 08:45:19 UTC (rev 30713)
@@ -10875,19 +10875,7 @@
 		bScreen *sc;
 		Tex *tex;
 		Brush *brush;
-		Material *mat;
 
-		
-		/* geometry shader flags */
-		for(mat= main->mat.first; mat; mat= mat->id.next) {
-			if (mat->csi.geom_in == 0)
-			{
-				mat->csi.flag = 0;
-				mat->csi.geom_in = MA_CS_GEOM_IN_TRIS;
-				mat->csi.geom_out = MA_CS_GEOM_OUT_TRIANGLE_STRIP;
-			}
-		}
-
 		for (sc= main->screen.first; sc; sc= sc->id.next) {
 			ScrArea *sa;
 			for (sa= sc->areabase.first; sa; sa= sa->next) {
@@ -11094,6 +11082,18 @@
 
 	/* put compatibility code here until next subversion bump */
 	{
+		Material *mat;
+
+		
+		/* geometry shader flags */
+		for(mat= main->mat.first; mat; mat= mat->id.next) {
+			if (mat->csi.geom_in == 0)
+			{
+				mat->csi.flag = 0;
+				mat->csi.geom_in = MA_CS_GEOM_IN_TRIS;
+				mat->csi.geom_out = MA_CS_GEOM_OUT_TRIANGLE_STRIP;
+			}
+		}
 	}
 
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */