diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-12-01 10:52:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-12-01 10:53:26 +0300 |
| commit | 9e56c570c3fbca4bae9a1da24828b6e640299f99 (patch) | |
| tree | 5698d3d2dc2f8ae2dc77c070d9beefa4e69e109e /source/blender/editors/uvedit | |
| parent | 2f80d304b0d50ea25367219b339bcfaa7958bbf4 (diff) | |
Cleanup: use more logical names for View3D.around
D1651 (own patch)
Diffstat (limited to 'source/blender/editors/uvedit')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_unwrap_ops.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 3fc0b654b82..1a106b40f32 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -727,7 +727,7 @@ static bool uvedit_center(Scene *scene, Image *ima, Object *obedit, float cent[2 { bool changed = false; - if (mode == V3D_CENTER) { /* bounding box */ + if (mode == V3D_AROUND_CENTER_BOUNDS) { /* bounding box */ float min[2], max[2]; if (ED_uvedit_minmax(scene, ima, obedit, min, max)) { mid_v2_v2v2(cent, min, max); diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 3ff3e29f79d..3f218136751 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -859,12 +859,12 @@ void ED_uvedit_live_unwrap(Scene *scene, Object *obedit) static void uv_map_transform_center(Scene *scene, View3D *v3d, float *result, Object *ob, BMEditMesh *em) { - int around = (v3d) ? v3d->around : V3D_CENTER; + const int around = (v3d) ? v3d->around : V3D_AROUND_CENTER_BOUNDS; /* only operates on the edit object - this is all that's needed now */ switch (around) { - case V3D_CENTER: /* bounding box center */ + case V3D_AROUND_CENTER_BOUNDS: /* bounding box center */ { BMFace *efa; BMLoop *l; @@ -883,15 +883,15 @@ static void uv_map_transform_center(Scene *scene, View3D *v3d, float *result, mid_v3_v3v3(result, min, max); break; } - case V3D_CURSOR: /* cursor center */ + case V3D_AROUND_CURSOR: /* cursor center */ { const float *curs = ED_view3d_cursor3d_get(scene, v3d); /* shift to objects world */ sub_v3_v3v3(result, curs, ob->obmat[3]); break; } - case V3D_LOCAL: /* object center */ - case V3D_CENTROID: /* multiple objects centers, only one object here*/ + case V3D_AROUND_LOCAL_ORIGINS: /* object center */ + case V3D_AROUND_CENTER_MEAN: /* multiple objects centers, only one object here*/ default: zero_v3(result); break; |