[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47776] trunk/blender/source/blender/ blenkernel/intern: Few minors style and type fixes (and a nice, harmless copy/paste error! ; ) )

[Bastien Montagne]

Revision: 47776
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47776
Author:   mont29
Date:     2012-06-12 08:32:06 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
Few minors style and type fixes (and a nice, harmless copy/paste error! ;) )

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

Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2012-06-12 08:28:25 UTC (rev 47775)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2012-06-12 08:32:06 UTC (rev 47776)
@@ -1287,9 +1287,11 @@
 		/* check if this driver's curve should be skipped */
 		if ((fcu->flag & (FCURVE_MUTED | FCURVE_DISABLED)) == 0) {
 			/* check if driver itself is tagged for recalculation */
-			if ((driver) && !(driver->flag & DRIVER_FLAG_INVALID) /*&& (driver->flag & DRIVER_FLAG_RECALC)*/) {  // XXX driver recalc flag is not set yet by depsgraph!
-				/* evaluate this using values set already in other places */
-				// NOTE: for 'layering' option later on, we should check if we should remove old value before adding new to only be done when drivers only changed
+			/* XXX driver recalc flag is not set yet by depsgraph! */
+			if ((driver) && !(driver->flag & DRIVER_FLAG_INVALID) /*&& (driver->flag & DRIVER_FLAG_RECALC)*/) {
+				/* evaluate this using values set already in other places
+				 * NOTE: for 'layering' option later on, we should check if we should remove old value before adding
+				 *       new to only be done when drivers only changed */
 				calculate_fcurve(fcu, ctime);
 				ok = animsys_execute_fcurve(ptr, NULL, fcu);
 				

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2012-06-12 08:28:25 UTC (rev 47775)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2012-06-12 08:32:06 UTC (rev 47776)
@@ -822,12 +822,12 @@
 		if (data->flag == CHILDOF_ALL) {
 			
 			/* multiply target (parent matrix) by offset (parent inverse) to get 
-			 * the effect of the parent that will be exherted on the owner
+			 * the effect of the parent that will be exerted on the owner
 			 */
 			mult_m4_m4m4(parmat, ct->matrix, data->invmat);
 			
 			/* now multiply the parent matrix by the owner matrix to get the 
-			 * the effect of this constraint (i.e.  owner is 'parented' to parent)
+			 * the effect of this constraint (i.e. owner is 'parented' to parent)
 			 */
 			mult_m4_m4m4(cob->matrix, parmat, cob->matrix);
 		}
@@ -864,7 +864,7 @@
 			loc_eulO_size_to_mat4(invmat, loco, eulo, sizo, cob->rotOrder);
 			
 			/* multiply target (parent matrix) by offset (parent inverse) to get 
-			 * the effect of the parent that will be exherted on the owner
+			 * the effect of the parent that will be exerted on the owner
 			 */
 			mult_m4_m4m4(parmat, ct->matrix, invmat);
 			
@@ -1620,7 +1620,7 @@
 
 static void rotlike_id_looper(bConstraint *con, ConstraintIDFunc func, void *userdata)
 {
-	bChildOfConstraint *data = con->data;
+	bRotateLikeConstraint *data = con->data;
 	
 	/* target only */
 	func(con, (ID **)&data->tar, FALSE, userdata);