[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53301] trunk/blender/source/blender: code cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Dec 23 17:09:27 CET 2012
Revision: 53301
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53301
Author: campbellbarton
Date: 2012-12-23 16:09:26 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
code cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgmix.c
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2012-12-23 16:08:02 UTC (rev 53300)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2012-12-23 16:09:26 UTC (rev 53301)
@@ -1168,6 +1168,7 @@
static int do_add_image_extension(char *string, const char imtype, const ImageFormatData *im_format)
{
const char *extension = NULL;
+ (void)im_format; /* may be unused, depends on build options */
if (imtype == R_IMF_IMTYPE_IRIS) {
if (!BLI_testextensie(string, ".rgb"))
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2012-12-23 16:08:02 UTC (rev 53300)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2012-12-23 16:09:26 UTC (rev 53301)
@@ -1554,7 +1554,7 @@
float BLI_bvhtree_bb_raycast(const float bv[6], const float light_start[3], const float light_end[3], float pos[3])
{
BVHRayCastData data;
- float dist = 0.0;
+ float dist;
data.hit.dist = FLT_MAX;
Modified: trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_vector_inline.c 2012-12-23 16:08:02 UTC (rev 53300)
+++ trunk/blender/source/blender/blenlib/intern/math_vector_inline.c 2012-12-23 16:09:26 UTC (rev 53301)
@@ -461,7 +461,7 @@
r[2] = v1[2] * v2[2];
}
-MINLINE void negate_v2(float r[3])
+MINLINE void negate_v2(float r[2])
{
r[0] = -r[0];
r[1] = -r[1];
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2012-12-23 16:08:02 UTC (rev 53300)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2012-12-23 16:09:26 UTC (rev 53301)
@@ -1276,7 +1276,7 @@
else { BLI_assert(0); }
}
else {
- if (l_fan->v == v_fan) { l_fan = l_fan; }
+ if (l_fan->v == v_fan) { /* l_fan = l_fan; */ }
else if (l_fan->next->v == v_fan) { l_fan = l_fan->next; }
else if (l_fan->prev->v == v_fan) { l_fan = l_fan->prev; }
else { BLI_assert(0); }
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c 2012-12-23 16:08:02 UTC (rev 53300)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c 2012-12-23 16:09:26 UTC (rev 53301)
@@ -268,7 +268,7 @@
BMW_end(&walker);
#else
- BM_elem_index_set(v_first, (offset + depth) % nth ? VERT_INDEX_IGNORE : VERT_INDEX_DO_COLLAPSE); /* set_dirty! */
+ BM_elem_index_set(v_first, ((offset + depth) % nth) ? VERT_INDEX_IGNORE : VERT_INDEX_DO_COLLAPSE); /* set_dirty! */
vert_seek_b_tot = 0;
vert_seek_b[vert_seek_b_tot++] = v_first;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-12-23 16:08:02 UTC (rev 53300)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-12-23 16:09:26 UTC (rev 53301)
@@ -1261,8 +1261,9 @@
*/
static int ndof_all_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
- if (event->type != NDOF_MOTION)
+ if (event->type != NDOF_MOTION) {
return OPERATOR_CANCELLED;
+ }
else {
ViewOpsData *vod;
@@ -1389,7 +1390,7 @@
}
/* rotate around custom center */
- if (vod && vod->use_dyn_ofs) {
+ if (vod->use_dyn_ofs) {
float q1[4];
/* compute the post multiplication quat, to rotate the offset correctly */
Modified: trunk/blender/source/blender/modifiers/intern/MOD_weightvgmix.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_weightvgmix.c 2012-12-23 16:08:02 UTC (rev 53300)
+++ trunk/blender/source/blender/modifiers/intern/MOD_weightvgmix.c 2012-12-23 16:09:26 UTC (rev 53301)
@@ -361,7 +361,7 @@
/* Mix weights. */
for (i = 0; i < numIdx; i++) {
- float weight2 = 0.0;
+ float weight2;
org_w[i] = dw1[i] ? dw1[i]->weight : wmd->default_weight_a;
weight2 = dw2[i] ? dw2[i]->weight : wmd->default_weight_b;
More information about the Bf-blender-cvs
mailing list