archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* dont change handle types when adjusting the radius or tilt of a curve handel.

Browse Source 
* dont take the handles into account for the manipulator center when they are not drawn.
This commit is contained in:
Campbell Barton
2008-10-06 09:17:49 +00:00
parent bd81616ac6
commit ba720030be
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/src/transform_conversions.c
View File

@@ -1428,7 +1428,10 @@ static void createTransCurveVerts(TransInfo *t)
if (propmode && head != tail)
calc_distanceCurveVerts(head, tail-1);
testhandlesNurb(nu); /* sets the handles based on their selection, do this after the data is copied to the TransData */
/* TODO - in the case of tilt and radius we can also avoid allocating the initTransDataCurveHandes
* but for now just dont change handle types */
if (ELEM(t->mode, TFM_CURVE_SHRINKFATTEN, TFM_TILT) == 0)
testhandlesNurb(nu); /* sets the handles based on their selection, do this after the data is copied to the TransData */
}
else {
TransData *head, *tail;

13
source/blender/src/transform_manipulator.c
View File

@@ -282,8 +282,17 @@ int calc_manipulator_stats(ScrArea *sa)
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
/* exception */
if( (bezt->f1 & SELECT) + (bezt->f2 & SELECT) + (bezt->f3 & SELECT) > SELECT ) {
/* exceptions
* if handles are hidden then only check the center points.
* If 2 or more are selected then only use the center point too.
*/
if (G.f & G_HIDDENHANDLES) {
if (bezt->f2 & SELECT) {
calc_tw_center(bezt->vec[1]);
totsel++;
}
}
else if ( (bezt->f1 & SELECT) + (bezt->f2 & SELECT) + (bezt->f3 & SELECT) > SELECT ) {
calc_tw_center(bezt->vec[1]);
totsel++;
}