[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28484] trunk/blender/source: add option -Y to enable python script execution.

[Campbell Barton]

Revision: 28484
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28484
Author:   campbellbarton
Date:     2010-04-28 10:02:51 +0200 (Wed, 28 Apr 2010)

Log Message:
-----------
add option -Y to enable python script execution.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/blender.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c	2010-04-28 07:36:47 UTC (rev 28483)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c	2010-04-28 08:02:51 UTC (rev 28484)
@@ -276,6 +276,8 @@
 	else bfd->globalf &= ~G_DEBUG;
 	if (G.f & G_SWAP_EXCHANGE) bfd->globalf |= G_SWAP_EXCHANGE;
 	else bfd->globalf &= ~G_SWAP_EXCHANGE;
+	if (G.f & G_SCRIPT_AUTOEXEC) bfd->globalf |= G_SCRIPT_AUTOEXEC;
+	else bfd->globalf &= ~G_SCRIPT_AUTOEXEC;
 
 	G.f= bfd->globalf;
 

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-04-28 07:36:47 UTC (rev 28483)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-04-28 08:02:51 UTC (rev 28484)
@@ -244,8 +244,8 @@
 	sound_init(CTX_data_main(C));
 
 	/* set the python auto-execute setting from user prefs */
-	if (U.flag & USER_SCRIPT_AUTOEXEC_DISABLE)	G.f &= ~G_SCRIPT_AUTOEXEC;
-	else										G.f |=  G_SCRIPT_AUTOEXEC;
+	/* disabled by default, unless explicitly enabled in the command line */
+	if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |=  G_SCRIPT_AUTOEXEC;
 
 	if(U.tempdir[0]) strncpy(btempdir, U.tempdir, FILE_MAXDIR+FILE_MAXFILE);
 }

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2010-04-28 07:36:47 UTC (rev 28483)
+++ trunk/blender/source/creator/creator.c	2010-04-28 08:02:51 UTC (rev 28484)
@@ -254,6 +254,7 @@
 	printf ("    \tNULL SDL OPENAL JACK\n");
 	printf ("  -h\t\tPrint this help text\n");
 	printf ("  -y\t\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)\n");
+	printf ("  -Y\t\tEnable automatic python script execution\n");
 	printf ("  -P <filename>\tRun the given Python script (filename or Blender Text)\n");
 #ifdef WIN32
 	printf ("  -R\t\tRegister .blend extension\n");
@@ -316,29 +317,15 @@
 	return -1;
 }
 
-static int disable_python(int argc, char **argv, void *data)
+static int enable_python(int argc, char **argv, void *data)
 {
-	G.f &= ~G_SCRIPT_AUTOEXEC;
+	G.f |= G_SCRIPT_AUTOEXEC;
 	return 0;
 }
 
-
-static int forked_tongue(int argc, char **argv, void *data)
+static int disable_python(int argc, char **argv, void *data)
 {
-	printf ("-y was used to disable script links because,\n");
-	printf ("\t-p being taken, Ton was of the opinion that Y\n");
-	printf ("\tlooked like a split (disabled) snake, and also\n");
-	printf ("\twas similar to a python's tongue (unproven).\n\n");
-
-	printf ("\tZr agreed because it gave him a reason to add a\n");
-	printf ("\tcompletely useless text into Blender.\n\n");
-
-	printf ("\tADDENDUM! Ton, in defense, found this picture of\n");
-	printf ("\tan Australian python, exhibiting her (his/its) forked\n");
-	printf ("\tY tongue. It could be part of an H Zr retorted!\n\n");
-	printf ("\thttp://www.users.bigpond.com/snake.man/\n");
-
-	exit(252);
+	G.f &= ~G_SCRIPT_AUTOEXEC;
 	return 0;
 }
 
@@ -881,7 +868,7 @@
 	BLI_argsAdd(ba, "--version", 1, print_version, NULL);
 	BLI_argsAdd(ba, "-v", 1, print_version, NULL);
 
-	BLI_argsAdd(ba, "-Y", 1, forked_tongue, NULL);
+	BLI_argsAdd(ba, "-Y", 1, enable_python, NULL);
 	BLI_argsAdd(ba, "-y", 1, disable_python, NULL);
 
 	BLI_argsAdd(ba, "-fpe", 1, set_fpe, NULL);
@@ -989,9 +976,6 @@
 	GEN_init_messaging_system();
 
 	/* first test for background */
-
-	G.f |= G_SCRIPT_AUTOEXEC; /* script links enabled by default */
-
 	ba = BLI_argsInit(argc, argv); /* skip binary path */
 	setupArguments(C, ba, &syshandle);