[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28397] trunk/blender/source/blender: warning cleanup, also made voxel.c and volumetric. c use BM_INLINE define rather then having their own ifdefs in each file.
Campbell Barton
ideasman42 at gmail.com
Sat Apr 24 12:08:08 CEST 2010
Revision: 28397
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28397
Author: campbellbarton
Date: 2010-04-24 12:08:07 +0200 (Sat, 24 Apr 2010)
Log Message:
-----------
warning cleanup, also made voxel.c and volumetric.c use BM_INLINE define rather then having their own ifdefs in each file.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/packedFile.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenlib/intern/voxel.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh.c
trunk/blender/source/blender/editors/mesh/editmesh_loop.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_file/writeimage.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/util/editmode_undo.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/python/intern/bpy_driver.c
trunk/blender/source/blender/render/intern/source/volumetric.c
Modified: trunk/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/packedFile.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -264,7 +264,7 @@
char tempname[FILE_MAXDIR + FILE_MAXFILE];
/* void *data; */
- if (guimode); //XXX waitcursor(1);
+ if (guimode) {} //XXX waitcursor(1);
strcpy(name, filename);
BLI_path_abs(name, G.sce);
@@ -308,7 +308,7 @@
}
}
- if(guimode); //XXX waitcursor(0);
+ if(guimode) {} //XXX waitcursor(0);
return (ret_value);
}
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -52,7 +52,7 @@
#include "RNA_access.h"
/* **** XXX **** */
-static void error() {}
+static void error(const char *error, ...) {}
#define INT 96
#define FLO 128
Modified: trunk/blender/source/blender/blenlib/intern/voxel.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/voxel.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/blenlib/intern/voxel.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -30,12 +30,7 @@
#include "BKE_utildefines.h"
-
-#if defined( _MSC_VER ) && !defined( __cplusplus )
-# define inline __inline
-#endif // defined( _MSC_VER ) && !defined( __cplusplus )
-
-static inline float D(float *data, int *res, int x, int y, int z)
+BM_INLINE float D(float *data, int *res, int x, int y, int z)
{
CLAMP(x, 0, res[0]-1);
CLAMP(y, 0, res[1]-1);
@@ -57,7 +52,7 @@
}
// returns highest integer <= x as integer (slightly faster than floor())
-inline int FLOORI(float x)
+BM_INLINE int FLOORI(float x)
{
const int r = (int)x;
return ((x >= 0.f) || (float)r == x) ? r : (r - 1);
@@ -65,7 +60,7 @@
// clamp function, cannot use the CLAMPIS macro, it sometimes returns unwanted results apparently related to gcc optimization flag -fstrict-overflow which is enabled at -O2
// this causes the test (x + 2) < 0 with int x == 2147483647 to return false (x being an integer, x + 2 should wrap around to -2147483647 so the test < 0 should return true, which it doesn't)
-inline int _clamp(int a, int b, int c)
+BM_INLINE int _clamp(int a, int b, int c)
{
return (a < b) ? b : ((a > c) ? c : a);
}
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -88,7 +88,7 @@
#endif
/* ************* XXX *************** */
-static int okee() {return 0;}
+static int okee(const char *dummy) {return 0;}
static void BIF_undo_push(const char *msg) {}
/* ************* XXX *************** */
Modified: trunk/blender/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- trunk/blender/source/blender/editors/armature/meshlaplacian.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/armature/meshlaplacian.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -65,7 +65,7 @@
/* ************* XXX *************** */
static void waitcursor(int val) {}
-static void progress_bar() {}
+static void progress_bar(int dummy_val, const char *dummy) {}
static void start_progress_bar() {}
static void end_progress_bar() {}
static void error(char *str) { printf("error: %s\n", str); }
Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/armature/poseobject.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -78,9 +78,9 @@
#include "armature_intern.h"
/* ************* XXX *************** */
-static int pupmenu() {return 0;}
-static void error() {};
-static void BIF_undo_push() {}
+static int pupmenu(const char *dummy) {return 0;}
+static void error(const char *dummy) {};
+static void BIF_undo_push(const char *dummy) {}
/* ************* XXX *************** */
/* This function is used to indicate that a bone is selected and needs keyframes inserted */
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -962,7 +962,7 @@
if(ELEM3(but->type, TEX, IDPOIN, SEARCH_MENU)) {
ID *id= (ID *)wmd->poin;
- if(but->poin==NULL && but->rnapoin.data==NULL);
+ if(but->poin==NULL && but->rnapoin.data==NULL) {}
button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
BLI_strncpy(data->str, id->name+2, data->maxlen);
button_activate_state(C, but, BUTTON_STATE_EXIT);
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -572,8 +572,7 @@
if(!BLI_getwdN(olddir))
restoredir = 0;
totfile = BLI_getdir(icondirstr, &dir);
- if (restoredir && !chdir(olddir))
- ; /* fix warning about checking return value */
+ if (restoredir && !chdir(olddir)) {} /* fix warning about checking return value */
for(i=0; i<totfile; i++) {
if( (dir[i].type & S_IFREG) ) {
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -77,7 +77,7 @@
#include "mesh_intern.h"
/* ***************** XXX **************** */
-static int pupmenu() {return 0;}
+static int pupmenu(const char *dummy) {return 0;}
/* ***************** XXX **************** */
Modified: trunk/blender/source/blender/editors/mesh/editmesh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/mesh/editmesh.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -87,8 +87,8 @@
*/
/* XXX */
-static void BIF_undo_push() {}
-static void error() {}
+static void BIF_undo_push(const char *dummy) {}
+static void error(const char *dummy) {}
/* ***************** HASH ********************* */
Modified: trunk/blender/source/blender/editors/mesh/editmesh_loop.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_loop.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/mesh/editmesh_loop.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -75,9 +75,9 @@
#include "mesh_intern.h"
/* **** XXX ******** */
-static void BIF_undo_push() {}
+static void BIF_undo_push(const char *dummy) {}
static void BIF_undo() {}
-static void error() {}
+static void error(const char *dummy) {}
static int qtest() {return 0;}
/* **** XXX ******** */
Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -90,7 +90,7 @@
/* XXX */
static void waitcursor(int val) {}
-static int pupmenu() {return 0;}
+static int pupmenu(const char *dummy) {return 0;}
/* ****************************** MIRROR **************** */
Modified: trunk/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/meshtools.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/mesh/meshtools.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -83,7 +83,7 @@
#include "mesh_intern.h"
/* XXX */
-static int pupmenu() {return 0;}
+static int pupmenu(const char *dummy) {return 0;}
/* XXX */
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -110,7 +110,7 @@
#include "object_intern.h" // own include
/* ************* XXX **************** */
-static void error() {}
+static void error(const char *dummy) {}
static void waitcursor(int val) {}
static int pupmenu(const char *msg) {return 0;}
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2010-04-24 08:16:25 UTC (rev 28396)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2010-04-24 10:08:07 UTC (rev 28397)
@@ -279,8 +279,9 @@
if(stroke->stroke_started) {
if(paint_smooth_stroke(stroke, mouse, event)) {
if(paint_space_stroke_enabled(stroke->brush)) {
- if(!paint_space_stroke(C, op, event, mouse))
- ;//ED_region_tag_redraw(ar);
+ if(!paint_space_stroke(C, op, event, mouse)) {
+ //ED_region_tag_redraw(ar);
+ }
}
else
paint_brush_stroke_add_step(C, op, event, mouse);
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list