[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39036] branches/soc-2011-cucumber/source/ blender/blenloader/intern/readfile.c: A couple of the doversions were in the wrong spot.

[Daniel Stokes]

Revision: 39036
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39036
Author:   kupoman
Date:     2011-08-04 21:41:41 +0000 (Thu, 04 Aug 2011)
Log Message:
-----------
A couple of the doversions were in the wrong spot. This should fix some issues with the exit key not being set.

Modified Paths:
--------------
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c

Modified: branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c	2011-08-04 20:45:38 UTC (rev 39035)
+++ branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c	2011-08-04 21:41:41 UTC (rev 39036)
@@ -11682,23 +11682,8 @@
 				}
 			}
 		}
-		{
-			/* Initialize BGE exit key to esc key */
-			Scene *scene;
-			for(scene= main->scene.first; scene; scene= scene->id.next) {
-				if (!scene->gm.exitkey)
-					scene->gm.exitkey = 218; //218 is the Blender key code for ESC
-			}
-		}
 
 		{
-			/* Initialize default values for collision masks */
-			Object *ob;
-			for(ob=main->object.first; ob; ob=ob->id.next)
-				ob->col_group = ob->col_mask = 1;
-		}
-
-		{
 			/* add default value for behind strength of camera actuator */
 			Object *ob;
 			bActuator *act;
@@ -11725,7 +11710,21 @@
 	/* put compatibility code here until next subversion bump */
 
 	{
-	
+		{
+			/* Initialize BGE exit key to esc key */
+			Scene *scene;
+			for(scene= main->scene.first; scene; scene= scene->id.next) {
+				if (!scene->gm.exitkey)
+					scene->gm.exitkey = 218; //218 is the Blender key code for ESC
+			}
+		}
+
+		{
+			/* Initialize default values for collision masks */
+			Object *ob;
+			for(ob=main->object.first; ob; ob=ob->id.next)
+				ob->col_group = ob->col_mask = 1;
+		}
 	}
 	
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */