[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56045] trunk/blender: code cleanup: minor changes, clang checker option for exact size matches and use vector functions.
Campbell Barton
ideasman42 at gmail.com
Sun Apr 14 14:01:12 CEST 2013
Revision: 56045
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56045
Author: campbellbarton
Date: 2013-04-14 12:01:12 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
code cleanup: minor changes, clang checker option for exact size matches and use vector functions.
Modified Paths:
--------------
trunk/blender/build_files/cmake/clang_array_check.py
trunk/blender/build_files/cmake/cmake_static_check_clang_array.py
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/object/object_relations.c
Modified: trunk/blender/build_files/cmake/clang_array_check.py
===================================================================
--- trunk/blender/build_files/cmake/clang_array_check.py 2013-04-14 11:57:35 UTC (rev 56044)
+++ trunk/blender/build_files/cmake/clang_array_check.py 2013-04-14 12:01:12 UTC (rev 56045)
@@ -21,6 +21,7 @@
# delay parsing functions until we need them
USE_LAZY_INIT = True
+USE_EXACT_COMPARE = False
# -----------------------------------------------------------------------------
# predefined function/arg sizes, handy sometimes, but not complete...
@@ -307,15 +308,25 @@
# testing
# size_def = 100
- if size < size_def and size != 1:
- location = node.location
- print("%s:%d:%d: argument %d is size %d, should be %d" %
- (location.file,
- location.line,
- location.column,
- i + 1, size, size_def
- ))
+ if size != 1:
+ if USE_EXACT_COMPARE:
+ # is_err = (size != size_def) and (size != 4 and size_def != 3)
+ is_err = (size != size_def)
+ else:
+ is_err = (size < size_def)
+ if is_err:
+ location = node.location
+ # if "math_color_inline.c" not in str(location.file):
+ if 1:
+ print("%s:%d:%d: argument %d is size %d, should be %d (from %s)" %
+ (location.file,
+ location.line,
+ location.column,
+ i + 1, size, size_def,
+ args[0] # always the same but useful when running threaded
+ ))
+
# we dont really care what we are looking at, just scan entire file for
# function calls.
Modified: trunk/blender/build_files/cmake/cmake_static_check_clang_array.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_clang_array.py 2013-04-14 11:57:35 UTC (rev 56044)
+++ trunk/blender/build_files/cmake/cmake_static_check_clang_array.py 2013-04-14 12:01:12 UTC (rev 56045)
@@ -49,6 +49,10 @@
check_commands = []
for c, inc_dirs, defs in source_info:
+
+ #~if "source/blender" not in c:
+ #~ continue
+
cmd = ([CHECKER_BIN] +
CHECKER_ARGS +
[c] +
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2013-04-14 11:57:35 UTC (rev 56044)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2013-04-14 12:01:12 UTC (rev 56045)
@@ -495,7 +495,10 @@
if (len != f->len)
err |= (1 << 23);
+ break;
}
+ default:
+ BLI_assert(0);
}
BMESH_ASSERT(err == 0);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-04-14 11:57:35 UTC (rev 56044)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-04-14 12:01:12 UTC (rev 56045)
@@ -291,7 +291,7 @@
/* 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 @@
*/
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;
+ }
+ }
}
/**
Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c 2013-04-14 11:57:35 UTC (rev 56044)
+++ trunk/blender/source/blender/editors/curve/editfont.c 2013-04-14 12:01:12 UTC (rev 56045)
@@ -455,9 +455,7 @@
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();
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c 2013-04-14 11:57:35 UTC (rev 56044)
+++ trunk/blender/source/blender/editors/object/object_relations.c 2013-04-14 12:01:12 UTC (rev 56045)
@@ -736,9 +736,7 @@
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)
More information about the Bf-blender-cvs
mailing list