[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55352] trunk/blender: code cleanup: incorrect sized array args, remove some redundant code.
Campbell Barton
ideasman42 at gmail.com
Sun Mar 17 11:26:23 CET 2013
Revision: 55352
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55352
Author: campbellbarton
Date: 2013-03-17 10:26:23 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
code cleanup: incorrect sized array args, remove some redundant code.
Modified Paths:
--------------
trunk/blender/intern/rigidbody/rb_bullet_api.cpp
trunk/blender/source/blender/blenkernel/BKE_ccg.h
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/bmfont.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c
trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/imbuf/intern/bmp.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/rectop.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.h
trunk/blender/source/tests/bl_run_operators.py
Modified: trunk/blender/intern/rigidbody/rb_bullet_api.cpp
===================================================================
--- trunk/blender/intern/rigidbody/rb_bullet_api.cpp 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/intern/rigidbody/rb_bullet_api.cpp 2013-03-17 10:26:23 UTC (rev 55352)
@@ -57,7 +57,7 @@
*/
#include <stdio.h>
-
+
#include "RBI_api.h"
#include "btBulletDynamicsCommon.h"
@@ -112,7 +112,7 @@
vec[1] = (float)btvec[1];
vec[2] = (float)btvec[2];
}
-static inline void copy_quat_btquat(float quat[3], const btQuaternion &btquat)
+static inline void copy_quat_btquat(float quat[4], const btQuaternion &btquat)
{
quat[0] = btquat.getW();
quat[1] = btquat.getX();
Modified: trunk/blender/source/blender/blenkernel/BKE_ccg.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_ccg.h 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/blenkernel/BKE_ccg.h 2013-03-17 10:26:23 UTC (rev 55352)
@@ -126,7 +126,7 @@
BLI_INLINE CCGElem *CCG_grid_elem(const CCGKey *key, CCGElem *elem, int x, int y)
{
- BLI_assert(x < key->grid_size && y < key->grid_size);
+// BLI_assert(x < key->grid_size && y < key->grid_size);
return CCG_elem_offset(key, elem, (y * key->grid_size + x));
}
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -1154,10 +1154,6 @@
if (ob->type != OB_MBALL) ob->flag |= OB_DONE; /* doesnt render */
for (a = 0, mp = mpoly; a < totface; a++, mp++) {
- int mv1;
- int mv2;
- int mv3;
- /* int mv4; */ /* UNUSED */
float *v1;
float *v2;
float *v3;
@@ -1171,9 +1167,9 @@
}
else {
BKE_mesh_calc_poly_normal(mp, mloop + mp->loopstart, mvert, f_no);
- v1 = mvert[(mv1 = loopstart[0].v)].co;
- v2 = mvert[(mv2 = loopstart[1].v)].co;
- v3 = mvert[(mv3 = loopstart[2].v)].co;
+ v1 = mvert[loopstart[0].v].co;
+ v2 = mvert[loopstart[1].v].co;
+ v3 = mvert[loopstart[2].v].co;
}
/* translation */
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -1596,7 +1596,7 @@
}
else if (pchan->bone->layer & layer_protected) {
ListBase proxylocal_constraints = {NULL, NULL};
- bPoseChannel pchanw = {NULL};
+ bPoseChannel pchanw;
/* copy posechannel to temp, but restore important pointers */
pchanw = *pchanp;
Modified: trunk/blender/source/blender/blenkernel/intern/bmfont.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bmfont.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/blenkernel/intern/bmfont.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -198,7 +198,7 @@
readBitmapFontVersion0(ibuf, rect, 4);
}
else {
- printf("detectBitmapFont :Unsupported version %d\n", version);
+ printf("detectBitmapFont :Unsupported version %d\n", (int)version);
}
/* on succes ibuf->userdata points to the bitmapfont */
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -1501,7 +1501,7 @@
static void find_first_points(PROCESS *mbproc, MetaBall *mb, int a)
{
MetaElem *ml;
- float f = 0.0f;
+ float f;
ml = G_mb.mainb[a];
f = 1.0f - (mb->thresh / ml->s);
Modified: trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -436,7 +436,7 @@
unsigned short **polys, int **dtrisToPolysMap,
int **dtrisToTrisMap, int **trisToFacesMap)
{
- int res = 1;
+ int res;
int ntris = 0, *recastData = NULL;
unsigned short *tris = NULL;
Modified: trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -496,7 +496,7 @@
const float *mask;
mask = CustomData_bmesh_get(&bm->vdata, v->head.data, CD_PAINT_MASK);
- return ((*mask) < 0.5);
+ return ((*mask) < 0.5f);
}
static void edge_queue_insert(EdgeQueue *q, BLI_mempool *pool, BMEdge *e,
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -378,7 +378,7 @@
for (i = 0, entry = onm->entries; i < nentries; i++, entry++) {
if (entry->old == addr) {
- ID *id = id = entry->newp;
+ ID *id = entry->newp;
if (id && (!lib || id->lib)) {
return id;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -1700,8 +1700,8 @@
BMFace *bmesh_jfke(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e)
{
BMLoop *l_iter, *l_f1 = NULL, *l_f2 = NULL;
- int newlen = 0, i, f1len = 0, f2len = 0, edok;
-
+ int newlen = 0, i, f1len = 0, f2len = 0;
+ bool edok;
/* can't join a face to itself */
if (f1 == f2) {
return NULL;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -84,7 +84,6 @@
{
if (data) {
MEM_freeN(data);
- data = NULL;
}
}
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -3154,9 +3154,6 @@
BLI_rctf_clamp_pt_v(&but->rect, data->ungrab_mval);
}
#endif
- if (is_horizontal == false) {
- mx_fl = my_fl;
- }
/* done correcting mouse */
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -2140,10 +2140,10 @@
uiLayoutRow(layout, TRUE);
uiBlockSetNFunc(block, curvemap_buttons_update, MEM_dupallocN(cb), cumap);
- bt = uiDefButF(block, NUM, 0, "X", 0, 2 * UI_UNIT_Y, UI_UNIT_X * 10, UI_UNIT_Y,
- &cmp->x, bounds.xmin, bounds.xmax, 1, 5, "");
- bt = uiDefButF(block, NUM, 0, "Y", 0, 1 * UI_UNIT_Y, UI_UNIT_X * 10, UI_UNIT_Y,
- &cmp->y, bounds.ymin, bounds.ymax, 1, 5, "");
+ uiDefButF(block, NUM, 0, "X", 0, 2 * UI_UNIT_Y, UI_UNIT_X * 10, UI_UNIT_Y,
+ &cmp->x, bounds.xmin, bounds.xmax, 1, 5, "");
+ uiDefButF(block, NUM, 0, "Y", 0, 1 * UI_UNIT_Y, UI_UNIT_X * 10, UI_UNIT_Y,
+ &cmp->y, bounds.ymin, bounds.ymax, 1, 5, "");
}
/* black/white levels */
Modified: trunk/blender/source/blender/editors/mesh/editmesh_rip.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_rip.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/editors/mesh/editmesh_rip.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -499,16 +499,9 @@
BM_elem_attrs_copy(bm, bm, BM_edge_other_loop(ulp->l_pair[0]->e, l_iter), l_iter);
}
else {
- if (v_shared == f_verts[0]) {
- BM_elem_attrs_copy(bm, bm, BM_edge_other_loop(ulp->l_pair[0]->e, l_iter), l_iter); l_iter = l_iter->next;
- BM_elem_attrs_copy(bm, bm, BM_edge_other_loop(ulp->l_pair[0]->e, l_iter), l_iter); l_iter = l_iter->next;
- BM_elem_attrs_copy(bm, bm, BM_edge_other_loop(ulp->l_pair[1]->e, l_iter), l_iter);
- }
- else {
- BM_elem_attrs_copy(bm, bm, BM_edge_other_loop(ulp->l_pair[0]->e, l_iter), l_iter); l_iter = l_iter->next;
- BM_elem_attrs_copy(bm, bm, BM_edge_other_loop(ulp->l_pair[0]->e, l_iter), l_iter); l_iter = l_iter->next;
- BM_elem_attrs_copy(bm, bm, BM_edge_other_loop(ulp->l_pair[1]->e, l_iter), l_iter);
- }
+ BM_elem_attrs_copy(bm, bm, BM_edge_other_loop(ulp->l_pair[0]->e, l_iter), l_iter); l_iter = l_iter->next;
+ BM_elem_attrs_copy(bm, bm, BM_edge_other_loop(ulp->l_pair[0]->e, l_iter), l_iter); l_iter = l_iter->next;
+ BM_elem_attrs_copy(bm, bm, BM_edge_other_loop(ulp->l_pair[1]->e, l_iter), l_iter);
}
}
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2013-03-17 10:15:06 UTC (rev 55351)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2013-03-17 10:26:23 UTC (rev 55352)
@@ -1478,7 +1478,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list