[Bf-blender-cvs] [bc9e66f] master: Revert fix for T38594, caused T40186 (just accept limitation for now)
Campbell Barton
noreply at git.blender.org
Tue May 27 13:30:55 CEST 2014
Commit: bc9e66f0830627e807f720dca4b9d5d8d39e732a
Author: Campbell Barton
Date: Tue May 27 21:28:42 2014 +1000
https://developer.blender.org/rBbc9e66f0830627e807f720dca4b9d5d8d39e732a
Revert fix for T38594, caused T40186 (just accept limitation for now)
===================================================================
M source/blender/blenkernel/intern/curve.c
===================================================================
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index e11af24..4de034d 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -3079,16 +3079,13 @@ static void calchandleNurb_intern(BezTriple *bezt, BezTriple *prev, BezTriple *n
return;
}
- if (is_fcurve == false) {
- len_a = len_v3v3(p2, p2_h1);
- len_b = len_v3v3(p2, p2_h2);
+ len_a = len_v3v3(p2, p2_h1);
+ len_b = len_v3v3(p2, p2_h2);
- if (len_a == 0.0f)
- len_a = 1.0f;
- if (len_b == 0.0f)
- len_b = 1.0f;
- len_ratio = len_a / len_b;
- }
+ if (len_a == 0.0f) len_a = 1.0f;
+ if (len_b == 0.0f) len_b = 1.0f;
+
+ len_ratio = len_a / len_b;
if (bezt->f1 & SELECT) { /* order of calculation */
if (ELEM(bezt->h2, HD_ALIGN, HD_ALIGN_DOUBLESIDE)) { /* aligned */
More information about the Bf-blender-cvs
mailing list