[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15093] branches/blender-2.47/source: branches/blender-2.47

[Diego Borghetti]

Revision: 15093
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15093
Author:   bdiego
Date:     2008-06-03 04:57:24 +0200 (Tue, 03 Jun 2008)

Log Message:
-----------
branches/blender-2.47

Merge from trunk:
	Revision: 15080
	Revision: 15085

Modified Paths:
--------------
    branches/blender-2.47/source/blender/blenkernel/intern/constraint.c
    branches/blender-2.47/source/blender/python/BPY_interface.c
    branches/blender-2.47/source/creator/creator.c

Modified: branches/blender-2.47/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/blender-2.47/source/blender/blenkernel/intern/constraint.c	2008-06-03 01:01:47 UTC (rev 15092)
+++ branches/blender-2.47/source/blender/blenkernel/intern/constraint.c	2008-06-03 02:57:24 UTC (rev 15093)
@@ -1882,7 +1882,7 @@
 {
 	bPythonConstraint *data= con->data;
 	
-	if (VALID_CONS_TARGET(ct)) {
+	if ((G.f & G_DOSCRIPTLINKS) && VALID_CONS_TARGET(ct)) {
 		/* special exception for curves - depsgraph issues */
 		if (ct->tar->type == OB_CURVE) {
 			Curve *cu= ct->tar->data;
@@ -1906,6 +1906,8 @@
 {
 	bPythonConstraint *data= con->data;
 	
+	if ((G.f & G_DOSCRIPTLINKS)==0)  return;
+	
 /* currently removed, until I this can be re-implemented for multiple targets */
 #if 0
 	/* Firstly, run the 'driver' function which has direct access to the objects involved 

Modified: branches/blender-2.47/source/blender/python/BPY_interface.c
===================================================================
--- branches/blender-2.47/source/blender/python/BPY_interface.c	2008-06-03 01:01:47 UTC (rev 15092)
+++ branches/blender-2.47/source/blender/python/BPY_interface.c	2008-06-03 02:57:24 UTC (rev 15093)
@@ -1222,7 +1222,7 @@
 {
 	PyObject *d, *mod;
 
-	if (bpy_pydriver_Dict) return -1;
+	if (bpy_pydriver_Dict || (G.f&G_DOSCRIPTLINKS)==0) return -1;
 
 	d = PyDict_New();
 	if (!d) return -1;
@@ -1998,7 +1998,7 @@
 	int setitem_retval;
 	PyGILState_STATE gilstate;
 
-	if (!driver) return result;
+	if (!driver || 	(G.f&G_DOSCRIPTLINKS)==0) return result;
 
 	expr = driver->name; /* the py expression to be evaluated */
 	if (!expr || expr[0]=='\0') return result;
@@ -2103,7 +2103,7 @@
 	if (!bpy_pydriver_Dict) {
 		if (bpy_pydriver_create_dict() != 0) {
 			fprintf(stderr,
-				"Button Python Eval error: couldn't create Python dictionary");
+				"Button Python Eval error: couldn't create Python dictionary \n");
 			PyGILState_Release(gilstate);
 			return -1;
 		}

Modified: branches/blender-2.47/source/creator/creator.c
===================================================================
--- branches/blender-2.47/source/creator/creator.c	2008-06-03 01:01:47 UTC (rev 15092)
+++ branches/blender-2.47/source/creator/creator.c	2008-06-03 02:57:24 UTC (rev 15093)
@@ -219,7 +219,7 @@
 	printf ("  -d\t\tTurn debugging on\n");
 	printf ("  -noaudio\tDisable audio on systems that support audio\n");
 	printf ("  -h\t\tPrint this help text\n");
-	printf ("  -y\t\tDisable script links, use -Y to find out why its -y\n");
+	printf ("  -y\t\tDisable automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes)\n");
 	printf ("  -P <filename>\tRun the given Python script (filename or Blender Text)\n");
 #ifdef WIN32
 	printf ("  -R\t\tRegister .blend extension\n");