Revision: 16608
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16608
Author:   aligorith
Date:     2008-09-19 14:43:21 +0200 (Fri, 19 Sep 2008)

Log Message:
-----------
PyConstraints:

Basic (non-python) target evaluation still occurs when scriptlinks are disabled.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/constraint.c

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2008-09-19 
12:41:26 UTC (rev 16607)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2008-09-19 
12:43:21 UTC (rev 16608)
@@ -1872,7 +1872,7 @@
 {
        bPythonConstraint *data= con->data;
        
-       if ((G.f & G_DOSCRIPTLINKS) && VALID_CONS_TARGET(ct)) {
+       if (VALID_CONS_TARGET(ct)) {
                /* special exception for curves - depsgraph issues */
                if (ct->tar->type == OB_CURVE) {
                        Curve *cu= ct->tar->data;
@@ -1886,7 +1886,10 @@
                 * this matrix if it needs to do so
                 */
                constraint_target_to_mat4(ct->tar, ct->subtarget, ct->matrix, 
CONSTRAINT_SPACE_WORLD, ct->space, con->headtail);
-               BPY_pyconstraint_target(data, ct);
+               
+               /* only execute target calculation if allowed */
+               if (G.f & G_DOSCRIPTLINKS)
+                       BPY_pyconstraint_target(data, ct);
        }
        else if (ct)
                Mat4One(ct->matrix);
@@ -1896,6 +1899,7 @@
 {
        bPythonConstraint *data= con->data;
        
+       /* only evaluate in python if we're allowed to do so */
        if ((G.f & G_DOSCRIPTLINKS)==0)  return;
        
 /* currently removed, until I this can be re-implemented for multiple targets 
*/


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to