diff options
author | Ton Roosendaal <ton@blender.org> | 2005-12-19 21:56:08 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-12-19 21:56:08 +0300 |
commit | 72d805f17d5e7732cf37c70c1ae732efd5d509c2 (patch) | |
tree | 69640121e30ca61b5c120a146c8f397a17839ae8 /source/blender/src/transform_manipulator.c | |
parent | 75a227e62009d8fb29f5bd7984ce82dcc4e68797 (diff) | |
parent | c1a2851c0d791f3e041ec6d33747cd056919b6ad (diff) |
Orange: monday merger with bf-blender (loadsa bugfixes).
ALso: a bit tidying up in editaction.c and python Object.c
Diffstat (limited to 'source/blender/src/transform_manipulator.c')
-rw-r--r-- | source/blender/src/transform_manipulator.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/source/blender/src/transform_manipulator.c b/source/blender/src/transform_manipulator.c index 990de66a6d3..6b16a3b0497 100644 --- a/source/blender/src/transform_manipulator.c +++ b/source/blender/src/transform_manipulator.c @@ -295,17 +295,24 @@ int calc_manipulator_stats(ScrArea *sa) bezt= nu->bezt; a= nu->pntsu; while(a--) { - if(bezt->f1) { - calc_tw_center(bezt->vec[0]); - totsel++; - } - if(bezt->f2) { + /* exception */ + if( (bezt->f1 & SELECT) + (bezt->f2 & SELECT) + (bezt->f3 & SELECT) > SELECT ) { calc_tw_center(bezt->vec[1]); totsel++; } - if(bezt->f3) { - calc_tw_center(bezt->vec[2]); - totsel++; + else { + if(bezt->f1) { + calc_tw_center(bezt->vec[0]); + totsel++; + } + if(bezt->f2) { + calc_tw_center(bezt->vec[1]); + totsel++; + } + if(bezt->f3) { + calc_tw_center(bezt->vec[2]); + totsel++; + } } bezt++; } |