diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-14 16:01:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-14 16:01:12 +0400 |
commit | 456f3b318aa6ce4af2f12844bd89532eabea3374 (patch) | |
tree | 3664395269f9f9c6f223bb943d21888b0dc74bf0 /source | |
parent | eb66c453017521894d788d06ec2b966949549aa2 (diff) |
code cleanup: minor changes, clang checker option for exact size matches and use vector functions.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 3 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 17 | ||||
-rw-r--r-- | source/blender/editors/curve/editfont.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_relations.c | 4 |
4 files changed, 16 insertions, 12 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index f46f73c5350..bec9d5c4d1a 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -495,7 +495,10 @@ int bmesh_elem_check(void *element, const char htype) if (len != f->len) err |= (1 << 23); + break; } + default: + BLI_assert(0); } BMESH_ASSERT(err == 0); diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 988b03d3c9d..2c16bb3a9fe 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -291,7 +291,7 @@ void BM_mesh_normals_update(BMesh *bm, const bool skip_hidden) /* compute normalized direction vectors for each edge. directions will be * used below for calculating the weights of the face normals on the vertex * normals */ - edgevec = MEM_mallocN(sizeof(float) * 3 * bm->totedge, "BM normal computation array"); + edgevec = MEM_mallocN(sizeof(*edgevec) * bm->totedge, __func__); BM_ITER_MESH_INDEX (e, &iter, bm, BM_EDGES_OF_MESH, index) { BM_elem_index_set(e, index); /* set_inline */ @@ -609,11 +609,16 @@ void BM_mesh_elem_index_validate(BMesh *bm, const char *location, const char *fu */ int BM_mesh_elem_count(BMesh *bm, const char htype) { - if (htype == BM_VERT) return bm->totvert; - else if (htype == BM_EDGE) return bm->totedge; - else if (htype == BM_FACE) return bm->totface; - - return 0; + switch (htype) { + case BM_VERT: return bm->totvert; + case BM_EDGE: return bm->totedge; + case BM_FACE: return bm->totface; + default: + { + BLI_assert(0); + return 0; + } + } } /** diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 63444c5c17e..16e7e0fde4a 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -455,9 +455,7 @@ static void txt_add_object(bContext *C, TextLine *firstline, int totline, float BKE_object_where_is_calc(scene, obedit); - obedit->loc[0] += offset[0]; - obedit->loc[1] += offset[1]; - obedit->loc[2] += offset[2]; + add_v3_v3(obedit->loc, offset); cu = obedit->data; cu->vfont = BKE_vfont_builtin_get(); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 5a688d7daf3..48ef663592a 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -736,9 +736,7 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object BKE_get_constraint_target_matrix(scene, con, 0, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, scene->r.cfra); sub_v3_v3v3(vec, ob->obmat[3], cmat[3]); - ob->loc[0] = vec[0]; - ob->loc[1] = vec[1]; - ob->loc[2] = vec[2]; + copy_v3_v3(ob->loc, vec); } else if (pararm && ob->type == OB_MESH && par->type == OB_ARMATURE) { if (partype == PAR_ARMATURE_NAME) |