[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22077] branches/blender2.5/blender/source /blender: fix for warnings and implicit declarations
Campbell Barton
ideasman42 at gmail.com
Fri Jul 31 03:40:17 CEST 2009
Revision: 22077
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22077
Author: campbellbarton
Date: 2009-07-31 03:40:15 +0200 (Fri, 31 Jul 2009)
Log Message:
-----------
fix for warnings and implicit declarations
also fixed smoke comparing a float's mem-location rather then its value.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenfont/BLF_api.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_modifier.h
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature_retarget.c
branches/blender2.5/blender/source/blender/editors/armature/meshlaplacian.c
branches/blender2.5/blender/source/blender/editors/include/ED_previewrender.h
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/mesh/meshtools.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
branches/blender2.5/blender/source/blender/editors/preview/previewrender.c
branches/blender2.5/blender/source/blender/editors/screen/screendump.c
branches/blender2.5/blender/source/blender/editors/space_file/writeimage.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/blender2.5/blender/source/blender/editors/space_text/text_python.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c
branches/blender2.5/blender/source/blender/python/generic/bpy_internal_import.c
branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c
Modified: branches/blender2.5/blender/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenfont/BLF_api.h 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/blenfont/BLF_api.h 2009-07-31 01:40:15 UTC (rev 22077)
@@ -140,6 +140,9 @@
/* Free the data return by BLF_dir_get. */
void BLF_dir_free(char **dirs, int count);
+/* Set the current draw mode. */
+void BLF_mode(int mode);
+
/* font->flags. */
#define BLF_ROTATION (1<<0)
#define BLF_CLIPPING (1<<1)
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_modifier.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_modifier.h 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_modifier.h 2009-07-31 01:40:15 UTC (rev 22077)
@@ -33,6 +33,7 @@
#include "DNA_modifier_types.h" /* needed for all enum typdefs */
#include "BKE_customdata.h"
+struct ID;
struct EditMesh;
struct DerivedMesh;
struct DagForest;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -334,7 +334,7 @@
*/
numtenthousand = 1;
vertdata = malloc(numtenthousand*3*30000*sizeof(float)); // uses realloc!
- if (!vertdata); STLALLOCERROR;
+ if (!vertdata) { STLALLOCERROR; }
linenum = 1;
/* Get rid of the first line */
@@ -357,7 +357,7 @@
++numtenthousand;
vertdata = realloc(vertdata,
numtenthousand*3*30000*sizeof(float));
- if (!vertdata); STLALLOCERROR;
+ if (!vertdata) { STLALLOCERROR; }
}
/* Don't read normal, but check line for proper syntax anyway
@@ -1687,7 +1687,7 @@
if(totvert==0) {
- if(ivsurf==0) ; //XXX error("Found no data");
+ if(ivsurf==0) {}; //XXX error("Found no data");
if(lbase->first) BLI_freelistN(lbase);
return;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -5832,7 +5832,7 @@
static void smokeModifier_deformVerts(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
- float (*vertexCos)[3], int numVerts)
+ float (*vertexCos)[3], int numVerts, int useRenderParams, int isFinalCalc)
{
SmokeModifierData *smd = (SmokeModifierData*) md;
DerivedMesh *dm = NULL;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -58,7 +58,7 @@
/* **** XXX ******** */
static int seqrectx= 0; /* bad bad global! */
static int seqrecty= 0;
-static void waitcursor() {}
+static void waitcursor(int val) {}
static int blender_test_break() {return 0;}
/* **** XXX ******** */
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -1144,7 +1144,7 @@
calc_voxel_transp(smd, pixel, tRay);
else
calc_voxel_transp_big(smd, pixel, tRay);
- if(tRay < 0)
+ if(*tRay < 0.0f)
return;
if (err_1 > 0) {
pixel[1] += y_inc;
@@ -1166,7 +1166,7 @@
calc_voxel_transp(smd, pixel, tRay);
else
calc_voxel_transp_big(smd, pixel, tRay);
- if(tRay < 0)
+ if(*tRay < 0.0f)
return;
if (err_1 > 0) {
pixel[0] += x_inc;
@@ -1188,7 +1188,7 @@
calc_voxel_transp(smd, pixel, tRay);
else
calc_voxel_transp_big(smd, pixel, tRay);
- if(tRay < 0)
+ if(*tRay < 0.0f)
return;
if (err_1 > 0) {
pixel[1] += y_inc;
Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -99,7 +99,7 @@
/* ************* XXX *************** */
static int okee() {return 0;}
-static void BIF_undo_push() {}
+static void BIF_undo_push(const char *msg) {}
/* ************* XXX *************** */
/* **************** tools on Editmode Armature **************** */
Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature_retarget.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature_retarget.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature_retarget.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -466,12 +466,12 @@
{
if (template_name[i+1] == 'S' || template_name[i+1] == 's')
{
- j += sprintf(name + j, side_string);
+ j += sprintf(name + j, "%s", side_string);
i++;
}
else if (template_name[i+1] == 'N' || template_name[i+1] == 'n')
{
- j += sprintf(name + j, num_string);
+ j += sprintf(name + j, "%s", num_string);
i++;
}
else
Modified: branches/blender2.5/blender/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/meshlaplacian.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/editors/armature/meshlaplacian.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -65,7 +65,7 @@
/* ************* XXX *************** */
-static void waitcursor() {}
+static void waitcursor(int val) {}
static void progress_bar() {}
static void start_progress_bar() {}
static void end_progress_bar() {}
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_previewrender.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_previewrender.h 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_previewrender.h 2009-07-31 01:40:15 UTC (rev 22077)
@@ -71,7 +71,7 @@
void ED_preview_free_dbase(void);
void ED_preview_shader_job(const struct bContext *C, void *owner, struct ID *id, struct ID *parent, int sizex, int sizey);
-void ED_preview_iconrender(struct Scene *scene, struct ID *id, int *rect, int sizex, int sizey);
+void ED_preview_iconrender(struct Scene *scene, struct ID *id, unsigned int *rect, int sizex, int sizey);
void ED_preview_draw(const struct bContext *C, void *idp, void *parentp, rcti *rect);
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -92,7 +92,7 @@
#include "BLO_sys_types.h" // for intptr_t support
/* XXX */
-static void waitcursor() {}
+static void waitcursor(int val) {}
static int pupmenu() {return 0;}
/* ****************************** MIRROR **************** */
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -94,7 +94,7 @@
/* XXX */
static int extern_qread() {return 0;}
-static void waitcursor() {}
+static void waitcursor(int val) {}
static int pupmenu() {return 0;}
static int qtest() {return 0;}
#define add_numbut(a, b, c, d, e, f, g) {}
Modified: branches/blender2.5/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/meshtools.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/editors/mesh/meshtools.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -96,7 +96,7 @@
#include "mesh_intern.h"
/* XXX */
-static void waitcursor() {}
+static void waitcursor(int val) {}
static void error() {}
static int pupmenu() {return 0;}
/* XXX */
Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c 2009-07-31 00:42:10 UTC (rev 22076)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c 2009-07-31 01:40:15 UTC (rev 22077)
@@ -138,10 +138,10 @@
/* ************* XXX **************** */
static void error() {}
-static void waitcursor() {}
-static int pupmenu() {return 0;}
-static int pupmenu_col() {return 0;}
-static int okee() {return 0;}
+static void waitcursor(int val) {}
+static int pupmenu(const char *msg) {return 0;}
+static int pupmenu_col(const char *msg, int val) {return 0;}
+static int okee(const char *msg) {return 0;}
/* port over here */
static bContext *C;
Modified: branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list