[Bf-blender-cvs] [a58a8eb] master: Missed setting handles in curve dissolve

Campbell Barton noreply at git.blender.org
Mon May 2 16:02:18 CEST 2016


Commit: a58a8ebea70aa0834e5c029638e095f67e885246
Author: Campbell Barton
Date:   Tue May 3 00:06:12 2016 +1000
Branches: master
https://developer.blender.org/rBa58a8ebea70aa0834e5c029638e095f67e885246

Missed setting handles in curve dissolve

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

M	source/blender/editors/curve/editcurve.c

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

diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 354530d..aedfbd4 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -5846,6 +5846,13 @@ static int curve_dissolve_exec(bContext *C, wmOperator *UNUSED(op))
 					        bezt_prev->vec[2], bezt_next->vec[0],
 					        &error_sq_dummy);
 
+					if (!ELEM(bezt_prev->h2, HD_FREE, HD_ALIGN)) {
+						bezt_prev->h2 = (bezt_prev->h2 == HD_VECT) ? HD_FREE : HD_ALIGN;
+					}
+					if (!ELEM(bezt_next->h1, HD_FREE, HD_ALIGN)) {
+						bezt_next->h1 = (bezt_next->h1 == HD_VECT) ? HD_FREE : HD_ALIGN;
+					}
+
 					MEM_freeN(points);
 				}
 			}




More information about the Bf-blender-cvs mailing list