Revision: 41729
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41729
Author: campbellbarton
Date: 2011-11-10 12:28:26 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
quiet some warnings from recent merge
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_dynamicpaint.h
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
trunk/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c
Modified: trunk/blender/source/blender/blenkernel/BKE_dynamicpaint.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_dynamicpaint.h 2011-11-10
12:15:09 UTC (rev 41728)
+++ trunk/blender/source/blender/blenkernel/BKE_dynamicpaint.h 2011-11-10
12:28:26 UTC (rev 41729)
@@ -6,7 +6,7 @@
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
- * Contributor(s): Miika H\xE4m\xE4l\xE4inen
+ * Contributor(s): Miika Hämäläinen
*
* ***** END GPL LICENSE BLOCK *****
*/
@@ -66,7 +66,7 @@
int dynamicPaint_surfaceHasColorPreview(struct DynamicPaintSurface *surface);
int dynamicPaint_outputLayerExists(struct DynamicPaintSurface *surface, struct
Object *ob, int index);
void dynamicPaintSurface_updateType(struct DynamicPaintSurface *surface);
-void dynamicPaintSurface_setUniqueName(struct DynamicPaintSurface *surface,
char *basename);
+void dynamicPaintSurface_setUniqueName(struct DynamicPaintSurface *surface,
const char *basename);
void dynamicPaint_resetPreview(struct DynamicPaintCanvasSettings *canvas);
struct DynamicPaintSurface *get_activeSurface(struct
DynamicPaintCanvasSettings *canvas);
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-10 12:15:09 UTC (rev 41728)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-10 12:28:26 UTC (rev 41729)
@@ -6,7 +6,7 @@
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
- * Contributor(s): Miika H\xE4m\xE4l\xE4inen
+ * Contributor(s): Miika Hämäläinen
*
* ***** END GPL LICENSE BLOCK *****
*/
@@ -204,7 +204,7 @@
/***************************** General Utils ******************************/
/* Set canvas error string to display at the bake report */
-static int setError(DynamicPaintCanvasSettings *canvas, char *string)
+static int setError(DynamicPaintCanvasSettings *canvas, const char *string)
{
/* Add error to canvas ui info label */
BLI_snprintf(canvas->error, sizeof(canvas->error), string);
@@ -339,7 +339,7 @@
return 0;
}
-void dynamicPaintSurface_setUniqueName(DynamicPaintSurface *surface, char
*basename)
+void dynamicPaintSurface_setUniqueName(DynamicPaintSurface *surface, const
char *basename)
{
char name[64];
BLI_strncpy(name, basename, sizeof(name)); /* in case basename is
surface->name use a copy */
@@ -488,7 +488,7 @@
#define BRUSH_USES_VELOCITY (1<<0)
-static int surface_getBrushFlags(DynamicPaintSurface *surface, Scene *scene,
Object *ob)
+static int surface_getBrushFlags(DynamicPaintSurface *surface, Scene *scene,
Object *UNUSED(ob))
{
Base *base = NULL;
GroupObject *go = NULL;
@@ -1516,7 +1516,10 @@
/*
* Apply canvas data to the object derived mesh
*/
-static struct DerivedMesh
*dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, Scene *scene,
Object *ob, DerivedMesh *dm)
+static struct DerivedMesh
*dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd,
+ Scene *UNUSED(scene),
+ Object *ob,
+ DerivedMesh *dm)
{
DerivedMesh *result = CDDM_copy(dm);
@@ -2068,7 +2071,7 @@
PaintUVPoint *tempPoints = NULL;
Vec3f *tempWeights = NULL;
- MVert *mvert = NULL;
+ /* MVert *mvert = NULL; */ /* UNUSED */
MFace *mface = NULL;
MTFace *tface = NULL;
Bounds2D *faceBB = NULL;
@@ -2079,7 +2082,7 @@
if (surface->format != MOD_DPAINT_SURFACE_F_IMAGESEQ) return
setError(canvas, "Can't bake non-\"image sequence\" formats.");
numOfFaces = dm->getNumFaces(dm);
- mvert = dm->getVertArray(dm);
+ /* mvert = dm->getVertArray(dm); */ /* UNUSED */
mface = dm->getFaceArray(dm);
/* get uv layer */
@@ -3039,7 +3042,7 @@
}
/* calculate velocity for object center point */
-static void dynamicPaint_brushObjectCalculateVelocity(Scene *scene, Object
*ob, DynamicPaintBrushSettings *brush, Vec3f *brushVel, float timescale)
+static void dynamicPaint_brushObjectCalculateVelocity(Scene *scene, Object
*ob, DynamicPaintBrushSettings *UNUSED(brush), Vec3f *brushVel, float timescale)
{
float prev_obmat[4][4];
float cur_loc[3] = {0.0f}, prev_loc[3] = {0.0f};
@@ -3076,7 +3079,13 @@
/*
* Paint a brush object mesh to the surface
*/
-static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
DynamicPaintBrushSettings *brush, Object *canvasOb, Object *brushOb,
BrushMaterials *bMats, Scene *scene, float timescale)
+static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
+ DynamicPaintBrushSettings *brush,
+ Object *UNUSED(canvasOb),
+ Object *brushOb,
+ BrushMaterials *bMats,
+ Scene *scene,
+ float timescale)
{
PaintSurfaceData *sData = surface->data;
PaintBakeData *bData = sData->bData;
@@ -3449,7 +3458,10 @@
/*
* Paint a particle system to the surface
*/
-static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
ParticleSystem *psys, DynamicPaintBrushSettings *brush, Object *canvasOb, float
timescale)
+static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
+ ParticleSystem *psys,
+ DynamicPaintBrushSettings *brush,
+ Object *UNUSED(canvasOb), float
timescale)
{
ParticleSettings *part=psys->part;
ParticleData *pa = NULL;
@@ -3686,7 +3698,7 @@
/* paint a single point of defined proximity radius to the surface */
static int dynamicPaint_paintSinglePoint(DynamicPaintSurface *surface, float
*pointCoord, DynamicPaintBrushSettings *brush,
-
Object *canvasOb, Object *brushOb, BrushMaterials *bMats, Scene *scene, float
timescale)
+ Object *UNUSED(canvasOb), Object
*brushOb, BrushMaterials *bMats, Scene *scene, float timescale)
{
int index;
PaintSurfaceData *sData = surface->data;
@@ -4878,4 +4890,4 @@
}
return dynamicPaint_doStep(scene, cObject, surface, timescale, 0.0f);
-}
\ No newline at end of file
+}
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-11-10
12:15:09 UTC (rev 41728)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-11-10
12:28:26 UTC (rev 41729)
@@ -122,7 +122,7 @@
/* forward declerations */
static int ptcache_file_compressed_read(PTCacheFile *pf, unsigned char
*result, unsigned int len);
static int ptcache_file_compressed_write(PTCacheFile *pf, unsigned char *in,
unsigned int in_len, unsigned char *out, int mode);
-static int ptcache_file_write(PTCacheFile *pf, void *f, unsigned int tot,
unsigned int size);
+static int ptcache_file_write(PTCacheFile *pf, const void *f, unsigned int
tot, unsigned int size);
static int ptcache_file_read(PTCacheFile *pf, void *f, unsigned int tot,
unsigned int size);
/* Common functions */
@@ -657,11 +657,11 @@
}
#else // WITH_SMOKE
static int ptcache_smoke_totpoint(void *UNUSED(smoke_v), int UNUSED(cfra)) {
return 0; };
-static void ptcache_smoke_read(PTCacheFile *UNUSED(pf), void *UNUSED(smoke_v))
{}
+static int ptcache_smoke_read(PTCacheFile *UNUSED(pf), void *UNUSED(smoke_v))
{ return 0; }
static int ptcache_smoke_write(PTCacheFile *UNUSED(pf), void
*UNUSED(smoke_v)) { return 0; }
#endif // WITH_SMOKE
-static int ptcache_dynamicpaint_totpoint(void *sd, int cfra)
+static int ptcache_dynamicpaint_totpoint(void *sd, int UNUSED(cfra))
{
DynamicPaintSurface *surface = (DynamicPaintSurface*)sd;
@@ -677,7 +677,7 @@
int cache_compress = 1;
/* version header */
- ptcache_file_write(pf, DPAINT_CACHE_VERSION, 1, sizeof(char)*4);
+ ptcache_file_write(pf, (void *)DPAINT_CACHE_VERSION, 1, sizeof(char)*4);
if(surface->format != MOD_DPAINT_SURFACE_F_IMAGESEQ && surface->data) {
unsigned int total_points=surface->data->total_points;
@@ -1261,7 +1261,7 @@
{
return (fread(f, size, tot, pf->fp) == tot);
}
-static int ptcache_file_write(PTCacheFile *pf, void *f, unsigned int tot,
unsigned int size)
+static int ptcache_file_write(PTCacheFile *pf, const void *f, unsigned int
tot, unsigned int size)
{
return (fwrite(f, size, tot, pf->fp) == tot);
}
Modified: trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
2011-11-10 12:15:09 UTC (rev 41728)
+++ trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
2011-11-10 12:28:26 UTC (rev 41729)
@@ -24,6 +24,7 @@
#include "BLI_blenlib.h"
#include "BLI_string.h"
+#include "BLI_utildefines.h"
#include "DNA_dynamicpaint_types.h"
#include "DNA_modifier_types.h"
@@ -52,7 +53,7 @@
#include "WM_types.h"
#include "WM_api.h"
-static int surface_slot_add_exec(bContext *C, wmOperator *op)
+static int surface_slot_add_exec(bContext *C, wmOperator *UNUSED(op))
{
DynamicPaintModifierData *pmd = 0;
Object *cObject = CTX_data_pointer_get_type(C, "object",
&RNA_Object).data;
@@ -94,7 +95,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
-static int surface_slot_remove_exec(bContext *C, wmOperator *op)
+static int surface_slot_remove_exec(bContext *C, wmOperator *UNUSED(op))
{
DynamicPaintModifierData *pmd = 0;
Object *cObject = CTX_data_pointer_get_type(C, "object",
&RNA_Object).data;
@@ -418,4 +419,4 @@
/* api callbacks */
ot->exec= dynamicpaint_bake_exec;
ot->poll= ED_operator_object_active_editable;
-}
\ No newline at end of file
+}
Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c
2011-11-10 12:15:09 UTC (rev 41728)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c
2011-11-10 12:28:26 UTC (rev 41729)
@@ -403,7 +403,7 @@
}
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
