[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40841] trunk/blender/source/blender/ blenkernel/intern: fix for own bad mistake, broke vector curve handles.

Campbell Barton ideasman42 at gmail.com
Fri Oct 7 02:26:05 CEST 2011


Revision: 40841
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40841
Author:   campbellbarton
Date:     2011-10-07 00:26:04 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
fix for own bad mistake, broke vector curve handles.

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

Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c	2011-10-07 00:08:40 UTC (rev 40840)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c	2011-10-07 00:26:04 UTC (rev 40841)
@@ -419,12 +419,10 @@
 	}
 
 	if(bezt->h1==HD_VECT) {	/* vector */
-		mul_v2_fl(dvec_a, 1.0f/3.0f);
-		sub_v2_v2v2(p2-3, p2, dvec_a);
+		madd_v2_v2v2fl(p2-3, p2, dvec_a, -1.0f/3.0f);
 	}
 	if(bezt->h2==HD_VECT) {
-		mul_v2_fl(dvec_b, 1.0f/3.0f);
-		sub_v2_v2v2(p2+3, p2, dvec_b);
+		madd_v2_v2v2fl(p2+3, p2, dvec_b,  1.0f/3.0f);
 	}
 }
 

Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c	2011-10-07 00:08:40 UTC (rev 40840)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c	2011-10-07 00:26:04 UTC (rev 40841)
@@ -2595,12 +2595,10 @@
 	}
 
 	if(bezt->h1==HD_VECT) {	/* vector */
-		mul_v3_fl(dvec_a, 1.0f/3.0f);
-		sub_v3_v3v3(p2-3, p2, dvec_a);
+		madd_v3_v3v3fl(p2-3, p2, dvec_a, -1.0f/3.0f);
 	}
 	if(bezt->h2==HD_VECT) {
-		mul_v3_fl(dvec_b, 1.0f/3.0f);
-		sub_v3_v3v3(p2+3, p2, dvec_b);
+		madd_v3_v3v3fl(p2+3, p2, dvec_b,  1.0f/3.0f);
 	}
 
 	len_b= len_v3v3(p2, p2+3);




More information about the Bf-blender-cvs mailing list