diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-07-11 19:53:37 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-11 19:53:37 +0300 |
commit | 3a810bfed6be4dc6645262eb6d4ca8064e1aea23 (patch) | |
tree | 1a28ef52beb8f09e29f6f8b657cfda3bfe7fcacf | |
parent | eed7efa151f3c17b65f38c4fd37543cbfe97b221 (diff) |
remove redundant casts
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index f7bedc3c9f9..759e408067a 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1813,7 +1813,7 @@ void BKE_mesh_smooth_flag_set(Object *meshOb, int enableSmooth) int i; for (i = 0; i < me->totpoly; i++) { - MPoly *mp = &((MPoly *) me->mpoly)[i]; + MPoly *mp = &me->mpoly[i]; if (enableSmooth) { mp->flag |= ME_SMOOTH; @@ -1824,7 +1824,7 @@ void BKE_mesh_smooth_flag_set(Object *meshOb, int enableSmooth) } for (i = 0; i < me->totface; i++) { - MFace *mf = &((MFace *) me->mface)[i]; + MFace *mf = &me->mface[i]; if (enableSmooth) { mf->flag |= ME_SMOOTH; diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index edf0bfce8c8..3b2cad6e81b 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -338,7 +338,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, DerivedMesh *dm, eset = BLI_edgeset_new_ex(__func__, BLI_EDGEHASH_SIZE_GUESS_FROM_POLYS(totface)); for (i = 0; i < totface; i++) { - MPoly *mp = &((MPoly *) mpoly)[i]; + MPoly *mp = &mpoly[i]; int nverts = mp->totloop; int j, j_next; CCGFace *origf = ccgSubSurf_getFace(origss, SET_INT_IN_POINTER(i)); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 6116903935b..e34bcf7c97b 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -2987,8 +2987,8 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P if ((me->editflag & ME_EDIT_PAINT_FACE_SEL) && me->mpoly) { for (index = 0; index < totindex; index++) { if (indexar[index] && indexar[index] <= me->totpoly) { - MPoly *mpoly = ((MPoly *)me->mpoly) + (indexar[index] - 1); - + const MPoly *mpoly = &me->mpoly[indexar[index] - 1]; + if ((mpoly->flag & ME_FACE_SEL) == 0) indexar[index] = 0; } diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index b86d670a28c..7b73a694570 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1255,7 +1255,7 @@ static void outliner_add_library_contents(Main *mainvar, SpaceOops *soops, TreeE break; if (id) { - ten = outliner_add_element(soops, &te->subtree, (void *)lbarray[a], NULL, TSE_ID_BASE, 0); + ten = outliner_add_element(soops, &te->subtree, lbarray[a], NULL, TSE_ID_BASE, 0); ten->directdata = lbarray[a]; ten->name = (char *)BKE_idcode_to_name_plural(GS(id->name)); @@ -1295,7 +1295,7 @@ static void outliner_add_orphaned_datablocks(Main *mainvar, SpaceOops *soops) * - Add a parameter to BKE_idcode_to_name_plural to get a sane "user-visible" name instead? * - Ensure that this uses nice icons for the datablock type involved instead of the dot? */ - ten = outliner_add_element(soops, &soops->tree, (void *)lbarray[a], NULL, TSE_ID_BASE, 0); + ten = outliner_add_element(soops, &soops->tree, lbarray[a], NULL, TSE_ID_BASE, 0); ten->directdata = lbarray[a]; ten->name = (char *)BKE_idcode_to_name_plural(GS(id->name)); |