[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32517] trunk/blender/source: most unused arg warnings corrected.
Campbell Barton
ideasman42 at gmail.com
Sat Oct 16 16:32:18 CEST 2010
Revision: 32517
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32517
Author: campbellbarton
Date: 2010-10-16 16:32:17 +0200 (Sat, 16 Oct 2010)
Log Message:
-----------
most unused arg warnings corrected.
- removed deprecated bitmap arg from IMB_allocImBuf (plugins will need updating).
- mostly tagged UNUSED() since some of these functions look like they may need to have the arguments used later.
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/endian.c
trunk/blender/source/blender/avi/intern/mjpeg.c
trunk/blender/source/blender/blenfont/intern/blf_lang.c
trunk/blender/source/blender/blenkernel/BKE_cloth.h
trunk/blender/source/blender/blenkernel/BKE_mesh.h
trunk/blender/source/blender/blenkernel/BKE_object.h
trunk/blender/source/blender/blenkernel/BKE_scene.h
trunk/blender/source/blender/blenkernel/BKE_sound.h
trunk/blender/source/blender/blenkernel/intern/BME_tools.c
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/boids.c
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/bvhutils.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/customdata_file.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/fmodifier.c
trunk/blender/source/blender/blenkernel/intern/group.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/packedFile.c
trunk/blender/source/blender/blenkernel/intern/paint.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/sound.c
trunk/blender/source/blender/blenkernel/intern/writeavi.c
trunk/blender/source/blender/blenkernel/intern/writeframeserver.c
trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c
trunk/blender/source/blender/blenlib/intern/dynlib.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenpluginapi/iff.h
trunk/blender/source/blender/blenpluginapi/intern/pluginapi.c
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/anim_deps.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/animation/drivers.c
trunk/blender/source/blender/editors/animation/fmodifier_ui.c
trunk/blender/source/blender/editors/animation/keyframes_draw.c
trunk/blender/source/blender/editors/animation/keyframes_edit.c
trunk/blender/source/blender/editors/animation/keyframes_general.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/animation/keyingsets.c
trunk/blender/source/blender/editors/armature/editarmature_generate.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/include/ED_keyframes_draw.h
trunk/blender/source/blender/editors/include/ED_keyframing.h
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/include/ED_object.h
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_add.c
trunk/blender/source/blender/editors/mesh/editmesh_lib.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/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/loopcut.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/object/object_ops.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/physics/physics_pointcache.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_undo.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/sound/sound_ops.c
trunk/blender/source/blender/editors/space_action/action_select.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_sequencer/sequencer_scopes.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_input.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/editors/transform/transform_ndofinput.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/editors/util/editmode_undo.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/imbuf/IMB_imbuf.h
trunk/blender/source/blender/imbuf/intern/allocimbuf.c
trunk/blender/source/blender/imbuf/intern/anim.c
trunk/blender/source/blender/imbuf/intern/bmp.c
trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp
trunk/blender/source/blender/imbuf/intern/divers.c
trunk/blender/source/blender/imbuf/intern/filter.c
trunk/blender/source/blender/imbuf/intern/iris.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
trunk/blender/source/blender/imbuf/intern/openexr/openexr_multi.h
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/imbuf/intern/targa.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/imbuf/intern/thumbs_blend.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/makesrna/intern/rna_animation.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_sound.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_normal.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_translate.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_value.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
trunk/blender/source/blender/nodes/intern/CMP_util.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_math.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_output.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_value.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_at.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/rayobject_instance.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/sss.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp
trunk/blender/source/gameengine/VideoTexture/ImageBuff.cpp
Modified: trunk/blender/source/blender/avi/intern/endian.c
===================================================================
--- trunk/blender/source/blender/avi/intern/endian.c 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/avi/intern/endian.c 2010-10-16 14:32:17 UTC (rev 32517)
@@ -206,6 +206,8 @@
MEM_freeN (data);
#else /* WORDS_BIGENDIAN */
+ (void)movie; /* unused */
+ (void)type; /* unused */
fwrite (datain, block, size, fp);
#endif /* WORDS_BIGENDIAN */
}
Modified: trunk/blender/source/blender/avi/intern/mjpeg.c
===================================================================
--- trunk/blender/source/blender/avi/intern/mjpeg.c 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/avi/intern/mjpeg.c 2010-10-16 14:32:17 UTC (rev 32517)
@@ -403,7 +403,7 @@
/* Decompression from memory */
static void jpegmemsrcmgr_init_source(j_decompress_ptr dinfo) {
- ;
+ (void)dinfo;
}
static boolean jpegmemsrcmgr_fill_input_buffer(j_decompress_ptr dinfo) {
Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c 2010-10-16 14:32:17 UTC (rev 32517)
@@ -118,11 +118,13 @@
void BLF_lang_encoding(char *str)
{
+ (void)str;
return;
}
void BLF_lang_set(char *str)
{
+ (void)str;
return;
}
Modified: trunk/blender/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_cloth.h 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/blenkernel/BKE_cloth.h 2010-10-16 14:32:17 UTC (rev 32517)
@@ -220,7 +220,7 @@
// needed for modifier.c
void cloth_free_modifier_extern ( struct ClothModifierData *clmd );
-void cloth_free_modifier ( struct Object *ob, struct ClothModifierData *clmd );
+void cloth_free_modifier ( struct ClothModifierData *clmd );
void cloth_init ( struct ClothModifierData *clmd );
struct DerivedMesh *clothModifier_do ( struct ClothModifierData *clmd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, int useRenderParams, int isFinalCalc );
Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mesh.h 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/blenkernel/BKE_mesh.h 2010-10-16 14:32:17 UTC (rev 32517)
@@ -132,8 +132,8 @@
/* Partial Mesh Visibility */
struct PartialVisibility *mesh_pmv_copy(struct PartialVisibility *);
void mesh_pmv_free(struct PartialVisibility *);
-void mesh_pmv_revert(struct Object *ob, struct Mesh *me);
-void mesh_pmv_off(struct Object *ob, struct Mesh *me);
+void mesh_pmv_revert(struct Mesh *me);
+void mesh_pmv_off(struct Mesh *me);
/* functions for making menu's from customdata layers */
int mesh_layers_menu_charlen(struct CustomData *data, int type); /* use this to work out how many chars to allocate */
Modified: trunk/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_object.h 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/blenkernel/BKE_object.h 2010-10-16 14:32:17 UTC (rev 32517)
@@ -71,7 +71,7 @@
void object_make_proxy(struct Object *ob, struct Object *target, struct Object *gob);
void object_copy_proxy_drivers(struct Object *ob, struct Object *target);
-void unlink_object(struct Scene *scene, struct Object *ob);
+void unlink_object(struct Object *ob);
int exist_object(struct Object *obtest);
void *add_camera(char *name);
struct Camera *copy_camera(struct Camera *cam);
Modified: trunk/blender/source/blender/blenkernel/BKE_scene.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_scene.h 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/blenkernel/BKE_scene.h 2010-10-16 14:32:17 UTC (rev 32517)
@@ -64,7 +64,7 @@
void set_scene_bg(struct Main *bmain, struct Scene *sce);
struct Scene *set_scene_name(struct Main *bmain, char *name);
-struct Scene *copy_scene(struct Main *bmain, struct Scene *sce, int type);
+struct Scene *copy_scene(struct Scene *sce, int type);
void unlink_scene(struct Main *bmain, struct Scene *sce, struct Scene *newsce);
int next_object(struct Scene **scene, int val, struct Base **base, struct Object **ob);
Modified: trunk/blender/source/blender/blenkernel/BKE_sound.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sound.h 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/blenkernel/BKE_sound.h 2010-10-16 14:32:17 UTC (rev 32517)
@@ -40,7 +40,7 @@
void sound_init_once();
-void sound_init(struct Main *main);
+void sound_init(void);
void sound_exit();
@@ -62,7 +62,7 @@
void sound_delete_cache(struct bSound* sound);
-void sound_load(struct Main *main, struct bSound* sound);
+void sound_load(struct bSound* sound);
void sound_free(struct bSound* sound);
Modified: trunk/blender/source/blender/blenkernel/intern/BME_tools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_tools.c 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/blenkernel/intern/BME_tools.c 2010-10-16 14:32:17 UTC (rev 32517)
@@ -918,7 +918,7 @@
* Returns -
* A BME_Mesh pointer to the BMesh passed as a parameter.
*/
-static BME_Mesh *BME_bevel_initialize(BME_Mesh *bm, int options, int defgrp_index, float angle, BME_TransData_Head *td) {
+static BME_Mesh *BME_bevel_initialize(BME_Mesh *bm, int options, int UNUSED(defgrp_index), float angle, BME_TransData_Head *td) {
BME_Vert *v;
BME_Edge *e;
BME_Poly *f;
@@ -1162,7 +1162,7 @@
//BME_JEKV(bm,v->edge,v);
}
}
-static BME_Mesh *BME_bevel_mesh(BME_Mesh *bm, float value, int res, int options, int defgrp_index, BME_TransData_Head *td) {
+static BME_Mesh *BME_bevel_mesh(BME_Mesh *bm, float value, int res, int options, int UNUSED(defgrp_index), BME_TransData_Head *td) {
BME_Vert *v, *nv;
BME_Edge *e, *oe;
BME_Loop *l, *l2;
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2010-10-16 14:32:17 UTC (rev 32517)
@@ -517,7 +517,7 @@
glEnd();
}
}
-static void emDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int drawAllEdges)
+static void emDM_drawEdges(DerivedMesh *dm, int UNUSED(drawLooseEdges), int UNUSED(drawAllEdges))
{
emDM_drawMappedEdges(dm, NULL, NULL);
}
@@ -628,7 +628,7 @@
}
/* note, material function is ignored for now. */
-static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int useColors, int (*setMaterial)(int, void *attribs))
+static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int UNUSED(useColors), int (*setMaterial)(int, void *attribs))
{
EditMeshDerivedMesh *emdm= (EditMeshDerivedMesh*) dm;
EditFace *efa;
@@ -1326,8 +1326,7 @@
}
}
-static DerivedMesh *getEditMeshDerivedMesh(EditMesh *em, Object *ob,
- float (*vertexCos)[3])
+static DerivedMesh *getEditMeshDerivedMesh(EditMesh *em, float (*vertexCos)[3])
{
EditMeshDerivedMesh *emdm = MEM_callocN(sizeof(*emdm), "emdm");
@@ -2023,7 +2022,7 @@
modifiers_clearErrors(ob);
if(cage_r && cageIndex == -1) {
- *cage_r = getEditMeshDerivedMesh(em, ob, NULL);
+ *cage_r = getEditMeshDerivedMesh(em, NULL);
}
dm = NULL;
@@ -2156,7 +2155,7 @@
*cage_r = dm;
} else {
*cage_r =
- getEditMeshDerivedMesh(em, ob,
+ getEditMeshDerivedMesh(em,
deformedVerts ? MEM_dupallocN(deformedVerts) : NULL);
}
}
@@ -2180,7 +2179,7 @@
} else if (!deformedVerts && cage_r && *cage_r) {
*final_r = *cage_r;
} else {
- *final_r = getEditMeshDerivedMesh(em, ob, deformedVerts);
+ *final_r = getEditMeshDerivedMesh(em, deformedVerts);
deformedVerts = NULL;
}
@@ -2396,9 +2395,9 @@
return em->derivedCage;
}
-DerivedMesh *editmesh_get_derived_base(Object *obedit, EditMesh *em)
+DerivedMesh *editmesh_get_derived_base(Object *UNUSED(obedit), EditMesh *em)
{
- return getEditMeshDerivedMesh(em, obedit, NULL);
+ return getEditMeshDerivedMesh(em, NULL);
}
@@ -2484,7 +2483,7 @@
if(mti->type==eModifierTypeType_OnlyDeform && mti->deformMatricesEM) {
if(!defmats) {
- dm= getEditMeshDerivedMesh(em, ob, NULL);
+ dm= getEditMeshDerivedMesh(em, NULL);
deformedVerts= editmesh_getVertexCos(em, &numVerts);
defmats= MEM_callocN(sizeof(*defmats)*numVerts, "defmats");
Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2010-10-16 14:32:17 UTC (rev 32517)
@@ -1091,7 +1091,7 @@
/* For the calculation of the effects of an Action at the given frame on an object
* This is currently only used for the Action Constraint
*/
-void what_does_obaction (Scene *scene, Object *ob, Object *workob, bPose *pose, bAction *act, char groupname[], float cframe)
+void what_does_obaction (Scene *UNUSED(scene), Object *ob, Object *workob, bPose *pose, bAction *act, char groupname[], float cframe)
{
bActionGroup *agrp= action_groups_find_named(act, groupname);
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2010-10-16 11:52:30 UTC (rev 32516)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2010-10-16 14:32:17 UTC (rev 32517)
@@ -1138,7 +1138,7 @@
dm->release(dm);
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list