[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13625] trunk/blender/source/blender/ blenkernel/intern/constraint.c: Reverting change to transform constraint...
Joshua Leung
aligorith at gmail.com
Sun Feb 10 11:08:14 CET 2008
Revision: 13625
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13625
Author: aligorith
Date: 2008-02-10 11:08:14 +0100 (Sun, 10 Feb 2008)
Log Message:
-----------
Reverting change to transform constraint... (argh!)
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-02-10 10:01:57 UTC (rev 13624)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2008-02-10 10:08:14 UTC (rev 13625)
@@ -3057,24 +3057,24 @@
float dvec[3], sval[3];
short i;
- /* extract components of owner's matrix */
- VECCOPY(loc, cob->matrix[3]);
- Mat4ToEul(cob->matrix, eul);
- Mat4ToSize(cob->matrix, size);
-
/* obtain target effect */
switch (data->from) {
- case 2: /* scale */
- VecCopyf(dvec, size);
+ case 2: /* scale */
+ Mat4ToSize(ct->matrix, dvec);
break;
case 1: /* rotation */
- VecCopyf(dvec, eul);
+ Mat4ToEul(ct->matrix, dvec);
break;
default: /* location */
- VecCopyf(dvec, loc);
+ VecCopyf(dvec, ct->matrix[3]);
break;
- }
+ }
+ /* extract components of owner's matrix */
+ VECCOPY(loc, cob->matrix[3]);
+ Mat4ToEul(cob->matrix, eul);
+ Mat4ToSize(cob->matrix, size);
+
/* determine where in range current transforms lie */
if (data->expo) {
for (i=0; i<3; i++) {
More information about the Bf-blender-cvs
mailing list