[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54106] branches/ge_harmony/source/blender /blenloader/intern/readfile.c: Fixing up a do_version broken in the merge.

[Daniel Stokes]

Revision: 54106
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54106
Author:   kupoman
Date:     2013-01-26 06:57:21 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
Fixing up a do_version broken in the merge. With out it the render target was set to the GL_R8 texture format (causing only red to render).

Modified Paths:
--------------
    branches/ge_harmony/source/blender/blenloader/intern/readfile.c

Modified: branches/ge_harmony/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/ge_harmony/source/blender/blenloader/intern/readfile.c	2013-01-26 05:34:06 UTC (rev 54105)
+++ branches/ge_harmony/source/blender/blenloader/intern/readfile.c	2013-01-26 06:57:21 UTC (rev 54106)
@@ -8707,14 +8707,6 @@
 
 			if (scene->r.bake_samples == 0)
 			scene->r.bake_samples = 256;
-
-			/* If the prepass resolution has not been set,
-			then the render format needs to be set as well */
-			if (scene->gm.r.prepassresolution == 0.0) {
-				scene->gm.r.prepassresolution = 100.0;
-				scene->gm.r.rendercomponents[0] = SCE_GAMERENDER_RGB;
-				scene->gm.r.renderformats[0] = SCE_GAMERENDER_8;
-			}
 		}
 
 		for (image = main->image.first; image; image = image->id.next) {
@@ -8782,7 +8774,19 @@
 			}
 		}
 	}
-
+	
+	{
+		Scene *scene;
+		for (scene = main->scene.first; scene; scene = scene->id.next) {
+			/* If the prepass resolution has not been set,
+			then the render format needs to be set as well */
+			if (scene->gm.r.prepassresolution == 0.0) {
+				scene->gm.r.prepassresolution = 100.0;
+				scene->gm.r.rendercomponents[0] = SCE_GAMERENDER_RGB;
+				scene->gm.r.renderformats[0] = SCE_GAMERENDER_8;
+			}
+		}
+	}
 	// if (main->versionfile < 265 || (main->versionfile == 265 && main->subversionfile < 7)) {
 
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */