diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-01 16:35:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-01 16:35:43 +0400 |
| commit | fd01e728773ebc9369a78dc27c5700394e8fd98b (patch) | |
| tree | c711fd25bf50e221081d321d3488e99bb35355d1 | |
| parent | 9b3e3f3e3197cc7f92f74a9f6b095c65bd43fa8f (diff) | |
check SELECT flags for curves (was checking for nonzero which would break if new files use this field for other flags)
| -rw-r--r-- | source/blender/editors/space_info/info_stats.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index c1cddf092aa..9686c6dfc29 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -194,9 +194,9 @@ static void stats_object_edit(Object *obedit, SceneStats *stats) a = nu->pntsu; while (a--) { stats->totvert += 3; - if (bezt->f1) stats->totvertsel++; - if (bezt->f2) stats->totvertsel++; - if (bezt->f3) stats->totvertsel++; + if (bezt->f1 & SELECT) stats->totvertsel++; + if (bezt->f2 & SELECT) stats->totvertsel++; + if (bezt->f3 & SELECT) stats->totvertsel++; bezt++; } } diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index bcc4bb60bb7..ee9bf486c20 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -428,11 +428,11 @@ int calc_manipulator_stats(const bContext *C) totsel++; } else { - if (bezt->f1) { + if (bezt->f1 & SELECT) { calc_tw_center(scene, bezt->vec[(v3d->around == V3D_LOCAL) ? 1 : 0]); totsel++; } - if (bezt->f3) { + if (bezt->f3 & SELECT) { calc_tw_center(scene, bezt->vec[(v3d->around == V3D_LOCAL) ? 1 : 2]); totsel++; } diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 4a208f6eee1..04bccac2a15 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -134,7 +134,8 @@ bool validSnap(TransInfo *t) bool activeSnap(TransInfo *t) { - return (t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP || (t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP_INVERT; + return ((t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP) || + ((t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP_INVERT); } void drawSnapping(const struct bContext *C, TransInfo *t) |