[Bf-blender-cvs] [24e6411] master: Fix T47366: Single slope linear curve was wrongly using vector handle

Sergey Sharybin noreply at git.blender.org
Tue Feb 9 14:53:17 CET 2016


Commit: 24e6411be6d0795d3107cc2d5dca8ae838e54663
Author: Sergey Sharybin
Date:   Tue Feb 9 14:51:32 2016 +0100
Branches: master
https://developer.blender.org/rB24e6411be6d0795d3107cc2d5dca8ae838e54663

Fix T47366: Single slope linear curve was wrongly using vector handle

Vector handle is only required for a symmetric curve to give nice a /\ shape.
Single slope curves better to use AUTO handle by default.

===================================================================

M	source/blender/blenkernel/intern/colortools.c

===================================================================

diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 3fb9ff1..df45761 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -293,10 +293,12 @@ void curvemap_reset(CurveMap *cuma, const rctf *clipr, int preset, int slope)
 		case CURVE_PRESET_LINE:
 			cuma->curve[0].x = clipr->xmin;
 			cuma->curve[0].y = clipr->ymax;
-			cuma->curve[0].flag |= CUMA_VECTOR;
 			cuma->curve[1].x = clipr->xmax;
 			cuma->curve[1].y = clipr->ymin;
-			cuma->curve[1].flag |= CUMA_VECTOR;
+			if (slope == CURVEMAP_SLOPE_POS_NEG) {
+				cuma->curve[0].flag |= CUMA_VECTOR;
+				cuma->curve[1].flag |= CUMA_VECTOR;
+			}
 			break;
 		case CURVE_PRESET_SHARP:
 			cuma->curve[0].x = 0;




More information about the Bf-blender-cvs mailing list