creator.c wasn't updated in my last commit, here it is (the change reverts my previous change to it, since it was made unnecessary by handling onload scriptlinks a little differently, as can be checked in blender.c and editscreen.c).

- BPython:  finishing object and nmesh .setMaterials commit, fixing two bugs.  Also fixed a crash with object.track (pointer wasn't checked for validity).  All based on reports and patch by Yann Vernier, thanks again.

1 files changed, 2 insertions, 8 deletions

diff --git a/source/creator/creator.c b/source/creator/creator.c
index 63a9c0203fc..3aacfe191f2 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -197,7 +197,6 @@ int main(int argc, char **argv)
 	int a, i, stax, stay, sizx, sizy;
 	SYS_SystemHandle syshandle;
 	Scene *sce;
-	short onload_script = 0;
 
 #if defined(WIN32) || defined (__linux__)
 	int audio = 1;
@@ -257,7 +256,7 @@ int main(int argc, char **argv)
 
 	/* first test for background */
 
-	onload_script = 1; /* scenescript always set! */
+	G.f |= G_SCENESCRIPT; /* scenescript always set! */
 
 	for(a=1; a<argc; a++) {
 
@@ -294,7 +293,7 @@ int main(int argc, char **argv)
              break;
 
 			case 'y':
-				onload_script = 0;
+				G.f &= ~G_SCENESCRIPT;
 				break;
 
 			case 'Y':
@@ -576,11 +575,6 @@ int main(int argc, char **argv)
 		set_scene(sce);
 	}
 
-	/* We set the ONLOAD script global flag here, when the screen has already
-	 * been set and the rendering context initialized.  If there's an onload
-	 * script it will be executed in screenmain. */
-	if (onload_script) G.f |= G_SCENESCRIPT;
-
 	screenmain();
 
 	return 0;