[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10982] trunk/blender/source/blender: == PyConstraints - 2 Fixes ==

[Joshua Leung]

Revision: 10982
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10982
Author:   aligorith
Date:     2007-06-20 11:58:16 +0200 (Wed, 20 Jun 2007)

Log Message:
-----------
== PyConstraints - 2 Fixes ==

* Error print for getSettings was lacking a newline
* When adding a PyConstraint using Ctrl-Alt-C, the script is now queried to find out whether it uses a target.

Modified Paths:
--------------
    trunk/blender/source/blender/python/BPY_interface.c
    trunk/blender/source/blender/src/editconstraint.c

Modified: trunk/blender/source/blender/python/BPY_interface.c
===================================================================
--- trunk/blender/source/blender/python/BPY_interface.c	2007-06-20 07:33:25 UTC (rev 10981)
+++ trunk/blender/source/blender/python/BPY_interface.c	2007-06-20 09:58:16 UTC (rev 10982)
@@ -1478,7 +1478,7 @@
 	
 	gval = PyDict_GetItemString(globals, "getSettings");
 	if (!gval) {
-		printf("ERROR: no getSettings function in constraint!");
+		printf("ERROR: no getSettings function in constraint!\n");
 		
 		/* free temp objects */
 		ReleaseGlobalDictionary( globals );

Modified: trunk/blender/source/blender/src/editconstraint.c
===================================================================
--- trunk/blender/source/blender/src/editconstraint.c	2007-06-20 07:33:25 UTC (rev 10981)
+++ trunk/blender/source/blender/src/editconstraint.c	2007-06-20 09:58:16 UTC (rev 10982)
@@ -747,17 +747,26 @@
 		}
 		else if(nr==18) {	
 			char *menustr;
-			int scriptint= 0, dummy_active=0;
+			int scriptint= 0, dummy_int=0;
+			float dummy_matrix[4][4];
 			
 			/* popup a list of usable scripts */
-			menustr = buildmenu_pyconstraints(NULL, &dummy_active);
+			menustr = buildmenu_pyconstraints(NULL, &dummy_int);
 			scriptint = pupmenu(menustr);
 			MEM_freeN(menustr);
 			
 			/* only add constraint if a script was chosen */
 			if (scriptint) {
+				/* add constraint */
 				con = add_new_constraint(CONSTRAINT_TYPE_PYTHON);
 				validate_pyconstraint_cb(con->data, &scriptint);
+				
+				/* make sure target allowance is set correctly */
+				dummy_int = BPY_pyconstraint_targets(con->data, dummy_matrix);
+				if (dummy_int) {
+					bPythonConstraint *pycon= (bPythonConstraint *)con->data;
+					pycon->flag |= PYCON_USETARGETS;
+				}
 			}
 		}