diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-01 15:26:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-01 15:42:28 +0300 |
commit | aab4f2b76253936d1ba09562f1b1a21661860bf7 (patch) | |
tree | e558b355cd2fc153c8e5d1ef94963eb1f18454f7 /source/blender/editors/uvedit | |
parent | 4bdd4aa63371bdd73f3a9484f92348f1bf13b4e5 (diff) |
cleanup: redundant casts & const cast correctness
Diffstat (limited to 'source/blender/editors/uvedit')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.c | 4 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index d054ccc1a85..c51a192b109 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -3402,8 +3402,8 @@ static void p_chart_stretch_minimize(PChart *chart, RNG *rng) static int p_compare_geometric_uv(const void *a, const void *b) { - PVert *v1 = *(PVert **)a; - PVert *v2 = *(PVert **)b; + const PVert *v1 = *(const PVert **)a; + const PVert *v2 = *(const PVert **)b; if (v1->uv[0] < v2->uv[0]) return -1; diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index eab3d5965f6..c5931cf2943 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -1354,16 +1354,15 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final) /* Stitch hash initialization functions */ static unsigned int uv_edge_hash(const void *key) { - UvEdge *edge = (UvEdge *)key; - return - BLI_ghashutil_uinthash(edge->uv2) + - BLI_ghashutil_uinthash(edge->uv1); + const UvEdge *edge = key; + return (BLI_ghashutil_uinthash(edge->uv2) + + BLI_ghashutil_uinthash(edge->uv1)); } static bool uv_edge_compare(const void *a, const void *b) { - UvEdge *edge1 = (UvEdge *)a; - UvEdge *edge2 = (UvEdge *)b; + const UvEdge *edge1 = a; + const UvEdge *edge2 = b; if ((edge1->uv1 == edge2->uv1) && (edge1->uv2 == edge2->uv2)) { return 0; |