kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- fixed remaining unused warnings.

Browse Source 
- omit render code from this warning (cmake only), until render branch is merged.
- moved -Wunused-parameter warning to apply to all C code in blender (not just ./source/blender), (cmake only).
This commit is contained in:
Campbell Barton 2010-10-17 06:38:56 +00:00
parent 28e144db92
commit 30b79ddcc6
46 changed files with 214 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -318,7 +318,7 @@ IF(UNIX AND NOT APPLE)
SET(PLATFORM_LINKFLAGS "-pthread") SET(PLATFORM_LINKFLAGS "-pthread")
# Better warnings # Better warnings
# note: -Wunused-parameter should be added but for now only apply to ./source/blender # note: -Wunused-parameter is added below for all GCC compilers
SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas") SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare") SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
@ -920,6 +920,12 @@ INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Extra compile flags # Extra compile flags
# TODO: remove this and uncommend the global arg, but for now adding here keeps it managable
IF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-parameter")
ENDIF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ${C_WARNINGS}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ${C_WARNINGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ${CXX_WARNINGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ${CXX_WARNINGS}")

5
source/blender/CMakeLists.txt
View File

@ -24,11 +24,6 @@
# #
# ***** END GPL LICENSE BLOCK ***** # ***** END GPL LICENSE BLOCK *****
# TODO: remove this and uncommend the global arg, but for now adding here keeps it managable
IF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-parameter")
ENDIF(CMAKE_COMPILER_IS_GNUCC)
ADD_SUBDIRECTORY(editors) ADD_SUBDIRECTORY(editors)
ADD_SUBDIRECTORY(windowmanager) ADD_SUBDIRECTORY(windowmanager)
ADD_SUBDIRECTORY(blenkernel) ADD_SUBDIRECTORY(blenkernel)

4
source/blender/avi/intern/avirgb.c
View File

@ -52,6 +52,8 @@ void *avi_converter_from_avi_rgb (AviMovie *movie, int stream, unsigned char *bu
AviBitmapInfoHeader *bi; AviBitmapInfoHeader *bi;
short bits= 32; short bits= 32;
(void)size; /* unused */
bi= (AviBitmapInfoHeader *) movie->streams[stream].sf; bi= (AviBitmapInfoHeader *) movie->streams[stream].sf;
if (bi) bits= bi->BitCount; if (bi) bits= bi->BitCount;
@ -120,6 +122,8 @@ void *avi_converter_to_avi_rgb (AviMovie *movie, int stream, unsigned char *buff
int y, x, i, rowstride; int y, x, i, rowstride;
unsigned char *buf; unsigned char *buf;
(void)stream; /* unused */
*size= movie->header->Height * movie->header->Width * 3; *size= movie->header->Height * movie->header->Width * 3;
if (movie->header->Width%2) *size+= movie->header->Height; if (movie->header->Width%2) *size+= movie->header->Height;

7
source/blender/avi/intern/mjpeg.c
View File

@ -145,6 +145,8 @@ static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsign
struct jpeg_decompress_struct dinfo; struct jpeg_decompress_struct dinfo;
struct jpeg_error_mgr jerr; struct jpeg_error_mgr jerr;
(void)width; /* unused */
numbytes= 0; numbytes= 0;
dinfo.err = jpeg_std_error(&jerr); dinfo.err = jpeg_std_error(&jerr);
@ -325,6 +327,8 @@ void *avi_converter_from_mjpeg (AviMovie *movie, int stream, unsigned char *buff
int deint; int deint;
unsigned char *buf; unsigned char *buf;
(void)stream; /* unused */
buf= MEM_mallocN (movie->header->Height * movie->header->Width * 3, "avi.avi_converter_from_mjpeg 1"); buf= MEM_mallocN (movie->header->Height * movie->header->Width * 3, "avi.avi_converter_from_mjpeg 1");
deint= check_and_decode_jpeg(buffer, buf, movie->header->Width, movie->header->Height, *size); deint= check_and_decode_jpeg(buffer, buf, movie->header->Width, movie->header->Height, *size);
@ -374,10 +378,11 @@ void *avi_converter_to_mjpeg (AviMovie *movie, int stream, unsigned char *buffer
/* Compression from memory */ /* Compression from memory */
static void jpegmemdestmgr_init_destination(j_compress_ptr cinfo) { static void jpegmemdestmgr_init_destination(j_compress_ptr cinfo) {
; (void)cinfo; /* unused */
} }
static boolean jpegmemdestmgr_empty_output_buffer(j_compress_ptr cinfo) { static boolean jpegmemdestmgr_empty_output_buffer(j_compress_ptr cinfo) {
(void)cinfo; /* unused */
return TRUE; return TRUE;
} }

2
source/blender/avi/intern/options.c
View File

@ -41,6 +41,8 @@
AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream, AviOption option, void *opt_data) { AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream, AviOption option, void *opt_data) {
int i; int i;
(void)stream; /* unused */
if (movie->header->TotalFrames != 0) /* Can't change params after we have already started writing frames */ if (movie->header->TotalFrames != 0) /* Can't change params after we have already started writing frames */
return AVI_ERROR_OPTION; return AVI_ERROR_OPTION;

4
source/blender/avi/intern/rgb32.c
View File

@ -41,6 +41,8 @@ void *avi_converter_from_rgb32 (AviMovie *movie, int stream, unsigned char *buff
int y, x, rowstridea, rowstrideb; int y, x, rowstridea, rowstrideb;
unsigned char *buf; unsigned char *buf;
(void)stream; /* unused */
buf = MEM_mallocN (movie->header->Height * movie->header->Width * 3, "fromrgb32buf"); buf = MEM_mallocN (movie->header->Height * movie->header->Width * 3, "fromrgb32buf");
*size = movie->header->Height * movie->header->Width * 3; *size = movie->header->Height * movie->header->Width * 3;
@ -65,6 +67,8 @@ void *avi_converter_to_rgb32 (AviMovie *movie, int stream, unsigned char *buffer
unsigned char *buf; unsigned char *buf;
unsigned char *to, *from; unsigned char *to, *from;
(void)stream; /* unused */
buf= MEM_mallocN (movie->header->Height * movie->header->Width * 4, "torgb32buf"); buf= MEM_mallocN (movie->header->Height * movie->header->Width * 4, "torgb32buf");
*size= movie->header->Height * movie->header->Width * 4; *size= movie->header->Height * movie->header->Width * 4;

14
source/blender/blenkernel/intern/BME_tools.c
View File

@ -107,7 +107,7 @@ float *BME_new_transdata_float(BME_TransData_Head *td) {
return BLI_memarena_alloc(td->ma, sizeof(float)); return BLI_memarena_alloc(td->ma, sizeof(float));
} }
static int BME_is_nonmanifold_vert(BME_Mesh *bm, BME_Vert *v) { static int BME_is_nonmanifold_vert(BME_Mesh *UNUSED(bm), BME_Vert *v) {
BME_Edge *e, *oe; BME_Edge *e, *oe;
BME_Loop *l; BME_Loop *l;
int len, count, flag; int len, count, flag;
@ -217,7 +217,7 @@ static void BME_data_interp_from_verts(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2,
#endif #endif
static void BME_data_facevert_edgesplit(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2, BME_Vert *v, BME_Edge *e1, float fac){ static void BME_data_facevert_edgesplit(BME_Mesh *bm, BME_Vert *v1, BME_Vert *UNUSED(v2), BME_Vert *v, BME_Edge *e1, float fac){
void *src[2]; void *src[2];
float w[2]; float w[2];
BME_Loop *l=NULL, *v1loop = NULL, *vloop = NULL, *v2loop = NULL; BME_Loop *l=NULL, *v1loop = NULL, *vloop = NULL, *v2loop = NULL;
@ -356,7 +356,7 @@ static int BME_bevel_get_vec(float *vec, BME_Vert *v1, BME_Vert *v2, BME_TransDa
* vec2 is the direction of projection (pointing away from vec1) * vec2 is the direction of projection (pointing away from vec1)
* up_vec is used for orientation (expected to be normalized) * up_vec is used for orientation (expected to be normalized)
* returns the length of the projected vector that lies along vec1 */ * returns the length of the projected vector that lies along vec1 */
static float BME_bevel_project_vec(float *vec1, float *vec2, float *up_vec, int is_forward, BME_TransData_Head *td) { static float BME_bevel_project_vec(float *vec1, float *vec2, float *up_vec, int is_forward, BME_TransData_Head *UNUSED(td)) {
float factor, vec3[3], tmp[3],c1,c2; float factor, vec3[3], tmp[3],c1,c2;
cross_v3_v3v3(tmp,vec1,vec2); cross_v3_v3v3(tmp,vec1,vec2);
@ -582,7 +582,7 @@ static float BME_bevel_set_max(BME_Vert *v1, BME_Vert *v2, float value, BME_Tran
return max; return max;
} }
static BME_Vert *BME_bevel_wire(BME_Mesh *bm, BME_Vert *v, float value, int res, int options, BME_TransData_Head *td) { static BME_Vert *BME_bevel_wire(BME_Mesh *bm, BME_Vert *v, float value, int res, int UNUSED(options), BME_TransData_Head *td) {
BME_Vert *ov1, *ov2, *v1, *v2; BME_Vert *ov1, *ov2, *v1, *v2;
ov1 = BME_edge_getothervert(v->edge, v); ov1 = BME_edge_getothervert(v->edge, v);
@ -607,7 +607,7 @@ static BME_Vert *BME_bevel_wire(BME_Mesh *bm, BME_Vert *v, float value, int res,
return v1; return v1;
} }
static BME_Loop *BME_bevel_edge(BME_Mesh *bm, BME_Loop *l, float value, int options, float *up_vec, BME_TransData_Head *td) { static BME_Loop *BME_bevel_edge(BME_Mesh *bm, BME_Loop *l, float value, int UNUSED(options), float *up_vec, BME_TransData_Head *td) {
BME_Vert *v1, *v2, *kv; BME_Vert *v1, *v2, *kv;
BME_Loop *kl=NULL, *nl; BME_Loop *kl=NULL, *nl;
BME_Edge *e; BME_Edge *e;
@ -708,7 +708,7 @@ static BME_Loop *BME_bevel_edge(BME_Mesh *bm, BME_Loop *l, float value, int opti
return l; return l;
} }
static BME_Loop *BME_bevel_vert(BME_Mesh *bm, BME_Loop *l, float value, int options, float *up_vec, BME_TransData_Head *td) { static BME_Loop *BME_bevel_vert(BME_Mesh *bm, BME_Loop *l, float value, int UNUSED(options), float *up_vec, BME_TransData_Head *td) {
BME_Vert *v1, *v2; BME_Vert *v1, *v2;
BME_Poly *f; BME_Poly *f;
@ -859,7 +859,7 @@ static void BME_bevel_add_vweight(BME_TransData_Head *td, BME_Mesh *bm, BME_Vert
} }
} }
static float BME_bevel_get_angle(BME_Mesh *bm, BME_Edge *e, BME_Vert *v) { static float BME_bevel_get_angle(BME_Mesh *UNUSED(bm), BME_Edge *e, BME_Vert *v) {
BME_Vert *v1, *v2; BME_Vert *v1, *v2;
BME_Loop *l1, *l2; BME_Loop *l1, *l2;
float vec1[3], vec2[3], vec3[3], vec4[3]; float vec1[3], vec2[3], vec3[3], vec4[3];

19
source/blender/blenkernel/intern/CCGSubSurf.c
View File

@ -15,6 +15,13 @@
#define CCG_INLINE inline #define CCG_INLINE inline
#endif #endif
/* copied from BKE_utildefines.h ugh */
#ifdef __GNUC__
# define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
#else
# define UNUSED(x) x
#endif
/* used for normalize_v3 in BLI_math_vector /* used for normalize_v3 in BLI_math_vector
* float.h's FLT_EPSILON causes trouble with subsurf normals - campbell */ * float.h's FLT_EPSILON causes trouble with subsurf normals - campbell */
#define EPSILON (1.0e-35f) #define EPSILON (1.0e-35f)
@ -185,13 +192,13 @@ static int _ehashIterator_isStopped(EHashIterator *ehi) {
/***/ /***/
static void *_stdAllocator_alloc(CCGAllocatorHDL a, int numBytes) { static void *_stdAllocator_alloc(CCGAllocatorHDL UNUSED(a), int numBytes) {
return malloc(numBytes); return malloc(numBytes);
} }
static void *_stdAllocator_realloc(CCGAllocatorHDL a, void *ptr, int newSize, int oldSize) { static void *_stdAllocator_realloc(CCGAllocatorHDL UNUSED(a), void *ptr, int newSize, int UNUSED(oldSize)) {
return realloc(ptr, newSize); return realloc(ptr, newSize);
} }
static void _stdAllocator_free(CCGAllocatorHDL a, void *ptr) { static void _stdAllocator_free(CCGAllocatorHDL UNUSED(a), void *ptr) {
free(ptr); free(ptr);
} }
@ -2601,7 +2608,7 @@ float ccgSubSurf_getEdgeCrease(CCGEdge *e) {
/* Face accessors */ /* Face accessors */
CCGFaceHDL ccgSubSurf_getFaceFaceHandle(CCGSubSurf *ss, CCGFace *f) { CCGFaceHDL ccgSubSurf_getFaceFaceHandle(CCGSubSurf *UNUSED(ss), CCGFace *f) {
return f->fHDL; return f->fHDL;
} }
int ccgSubSurf_getFaceAge(CCGSubSurf *ss, CCGFace *f) { int ccgSubSurf_getFaceAge(CCGSubSurf *ss, CCGFace *f) {
@ -2619,14 +2626,14 @@ void *ccgSubSurf_getFaceUserData(CCGSubSurf *ss, CCGFace *f) {
int ccgSubSurf_getFaceNumVerts(CCGFace *f) { int ccgSubSurf_getFaceNumVerts(CCGFace *f) {
return f->numVerts; return f->numVerts;
} }
CCGVert *ccgSubSurf_getFaceVert(CCGSubSurf *ss, CCGFace *f, int index) { CCGVert *ccgSubSurf_getFaceVert(CCGSubSurf *UNUSED(ss), CCGFace *f, int index) {
if (index<0 || index>=f->numVerts) { if (index<0 || index>=f->numVerts) {
return NULL; return NULL;
} else { } else {
return FACE_getVerts(f)[index]; return FACE_getVerts(f)[index];
} }
} }
CCGEdge *ccgSubSurf_getFaceEdge(CCGSubSurf *ss, CCGFace *f, int index) { CCGEdge *ccgSubSurf_getFaceEdge(CCGSubSurf *UNUSED(ss), CCGFace *f, int index) {
if (index<0 || index>=f->numVerts) { if (index<0 || index>=f->numVerts) {
return NULL; return NULL;
} else { } else {

2
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -634,6 +634,8 @@ static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us
EditFace *efa; EditFace *efa;
int i, draw; int i, draw;
(void)setMaterial; /* unused */
if (emdm->vertexCos) { if (emdm->vertexCos) {
EditVert *eve; EditVert *eve;

6
source/blender/blenkernel/intern/boids.c
View File

@ -58,7 +58,7 @@ typedef struct BoidValues {
static int apply_boid_rule(BoidBrainData *bbd, BoidRule *rule, BoidValues *val, ParticleData *pa, float fuzziness); static int apply_boid_rule(BoidBrainData *bbd, BoidRule *rule, BoidValues *val, ParticleData *pa, float fuzziness);
static int rule_none(BoidRule *rule, BoidBrainData *UNUSED(data), BoidValues *val, ParticleData *pa) static int rule_none(BoidRule *UNUSED(rule), BoidBrainData *UNUSED(data), BoidValues *UNUSED(val), ParticleData *UNUSED(pa))
{ {
return 0; return 0;
} }
@ -344,7 +344,7 @@ static int rule_avoid_collision(BoidRule *rule, BoidBrainData *bbd, BoidValues *
return ret; return ret;
} }
static int rule_separate(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, ParticleData *pa) static int rule_separate(BoidRule *UNUSED(rule), BoidBrainData *bbd, BoidValues *val, ParticleData *pa)
{ {
KDTreeNearest *ptn = NULL; KDTreeNearest *ptn = NULL;
ParticleTarget *pt; ParticleTarget *pt;
@ -384,7 +384,7 @@ static int rule_separate(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Pa
} }
return ret; return ret;
} }
static int rule_flock(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, ParticleData *pa) static int rule_flock(BoidRule *UNUSED(rule), BoidBrainData *bbd, BoidValues *UNUSED(val), ParticleData *pa)
{ {
KDTreeNearest ptn[11]; KDTreeNearest ptn[11];
float vec[3] = {0.0f, 0.0f, 0.0f}, loc[3] = {0.0f, 0.0f, 0.0f}; float vec[3] = {0.0f, 0.0f, 0.0f}, loc[3] = {0.0f, 0.0f, 0.0f};

16
source/blender/blenkernel/intern/customdata.c
View File

@ -145,7 +145,7 @@ static void linklist_free_simple(void *link)
} }
static void layerInterp_mdeformvert(void **sources, float *weights, static void layerInterp_mdeformvert(void **sources, float *weights,
float *sub_weights, int count, void *dest) float *UNUSED(sub_weights), int count, void *dest)
{ {
MDeformVert *dvert = dest; MDeformVert *dvert = dest;
LinkNode *dest_dw = NULL; /* a list of lists of MDeformWeight pointers */ LinkNode *dest_dw = NULL; /* a list of lists of MDeformWeight pointers */
@ -203,7 +203,7 @@ static void layerInterp_mdeformvert(void **sources, float *weights,
static void layerInterp_msticky(void **sources, float *weights, static void layerInterp_msticky(void **sources, float *weights,
float *sub_weights, int count, void *dest) float *UNUSED(sub_weights), int count, void *dest)
{ {
float co[2], w; float co[2], w;
MSticky *mst; MSticky *mst;
@ -484,8 +484,8 @@ static void layerSwap_mdisps(void *data, const int *ci)
} }
} }
static void layerInterp_mdisps(void **UNUSED(sources), float *weights, float *sub_weights, static void layerInterp_mdisps(void **UNUSED(sources), float *UNUSED(weights),
int UNUSED(count), void *dest) float *UNUSED(sub_weights), int UNUSED(count), void *dest)
{ {
MDisps *d = dest; MDisps *d = dest;
int i; int i;
@ -563,7 +563,7 @@ static void layerCopy_mdisps(const void *source, void *dest, int count)
} }
} }
static void layerFree_mdisps(void *data, int count, int size) static void layerFree_mdisps(void *data, int count, int UNUSED(size))
{ {
int i; int i;
MDisps *d = data; MDisps *d = data;
@ -609,7 +609,7 @@ static int layerWrite_mdisps(CDataFile *cdf, void *data, int count)
return 1; return 1;
} }
static size_t layerFilesize_mdisps(CDataFile *cdf, void *data, int count) static size_t layerFilesize_mdisps(CDataFile *UNUSED(cdf), void *data, int count)
{ {
MDisps *d = data; MDisps *d = data;
size_t size = 0; size_t size = 0;
@ -2349,7 +2349,7 @@ static void customdata_external_filename(char filename[FILE_MAX], ID *id, Custom
BLI_path_abs(filename, path); BLI_path_abs(filename, path);
} }
void CustomData_external_reload(CustomData *data, ID *id, CustomDataMask mask, int totelem) void CustomData_external_reload(CustomData *data, ID *UNUSED(id), CustomDataMask mask, int totelem)
{ {
CustomDataLayer *layer; CustomDataLayer *layer;
const LayerTypeInfo *typeInfo; const LayerTypeInfo *typeInfo;
@ -2519,7 +2519,7 @@ void CustomData_external_write(CustomData *data, ID *id, CustomDataMask mask, in
cdf_free(cdf); cdf_free(cdf);
} }
void CustomData_external_add(CustomData *data, ID *id, int type, int UNUSED(totelem), const char *filename) void CustomData_external_add(CustomData *data, ID *UNUSED(id), int type, int UNUSED(totelem), const char *filename)
{ {
CustomDataExternal *external= data->external; CustomDataExternal *external= data->external;
CustomDataLayer *layer; CustomDataLayer *layer;

6
source/blender/blenkernel/intern/implicit.c
View File

@ -1218,7 +1218,7 @@ DO_INLINE void dfdx_damp(float to[3][3], float dir[3],float length,const float
} }
DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, lfVector *lF, lfVector *X, lfVector *V, fmatrix3x3 *dFdV, fmatrix3x3 *dFdX, float time) DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, lfVector *UNUSED(lF), lfVector *X, lfVector *V, fmatrix3x3 *UNUSED(dFdV), fmatrix3x3 *UNUSED(dFdX), float time)
{ {
Cloth *cloth = clmd->clothObject; Cloth *cloth = clmd->clothObject;
ClothVertex *verts = cloth->verts; ClothVertex *verts = cloth->verts;
@ -1353,7 +1353,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s,
} }
} }
DO_INLINE void cloth_apply_spring_force(ClothModifierData *clmd, ClothSpring *s, lfVector *lF, lfVector *X, lfVector *V, fmatrix3x3 *dFdV, fmatrix3x3 *dFdX) DO_INLINE void cloth_apply_spring_force(ClothModifierData *UNUSED(clmd), ClothSpring *s, lfVector *lF, lfVector *UNUSED(X), lfVector *UNUSED(V), fmatrix3x3 *dFdV, fmatrix3x3 *dFdX)
{ {
if(s->flags & CLOTH_SPRING_FLAG_NEEDED) if(s->flags & CLOTH_SPRING_FLAG_NEEDED)
{ {
@ -1708,7 +1708,7 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), lfVec
// printf("\n"); // printf("\n");
} }
static void simulate_implicit_euler(lfVector *Vnew, lfVector *lX, lfVector *lV, lfVector *lF, fmatrix3x3 *dFdV, fmatrix3x3 *dFdX, float dt, fmatrix3x3 *A, lfVector *B, lfVector *dV, fmatrix3x3 *S, lfVector *z, lfVector *olddV, fmatrix3x3 *P, fmatrix3x3 *Pinv, fmatrix3x3 *M, fmatrix3x3 *bigI) static void simulate_implicit_euler(lfVector *Vnew, lfVector *UNUSED(lX), lfVector *lV, lfVector *lF, fmatrix3x3 *dFdV, fmatrix3x3 *dFdX, float dt, fmatrix3x3 *A, lfVector *B, lfVector *dV, fmatrix3x3 *S, lfVector *z, lfVector *olddV, fmatrix3x3 *UNUSED(P), fmatrix3x3 *UNUSED(Pinv), fmatrix3x3 *M, fmatrix3x3 *UNUSED(bigI))
{ {
unsigned int numverts = dFdV[0].vcount; unsigned int numverts = dFdV[0].vcount;

2
source/blender/blenkernel/intern/nla.c
View File

@ -1585,7 +1585,7 @@ void BKE_nla_tweakmode_exit (AnimData *adt)
/* Baking Tools ------------------------------------------- */ /* Baking Tools ------------------------------------------- */
void BKE_nla_bake (Scene *scene, ID *id, AnimData *adt, int UNUSED(flag)) void BKE_nla_bake (Scene *scene, ID *UNUSED(id), AnimData *adt, int UNUSED(flag))
{ {
/* verify that data is valid /* verify that data is valid

6
source/blender/blenkernel/intern/particle.c
View File

@ -1647,7 +1647,7 @@ int psys_particle_dm_face_lookup(Object *ob, DerivedMesh *dm, int index, float *
return DMCACHE_NOTFOUND; return DMCACHE_NOTFOUND;
} }
static int psys_map_index_on_dm(DerivedMesh *dm, int from, int index, int index_dmcache, float *fw, float foffset, int *mapindex, float *mapfw) static int psys_map_index_on_dm(DerivedMesh *dm, int from, int index, int index_dmcache, float *fw, float UNUSED(foffset), int *mapindex, float *mapfw)
{ {
if(index < 0) if(index < 0)
return 0; return 0;
@ -1803,7 +1803,7 @@ ParticleSystemModifierData *psys_get_modifier(Object *ob, ParticleSystem *psys)
/* Particles on a shape */ /* Particles on a shape */
/************************************************/ /************************************************/
/* ready for future use */ /* ready for future use */
static void psys_particle_on_shape(int UNUSED(distr), int index, float *UNUSED(fuv), float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor) static void psys_particle_on_shape(int UNUSED(distr), int UNUSED(index), float *UNUSED(fuv), float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor)
{ {
/* TODO */ /* TODO */
float zerovec[3]={0.0f,0.0f,0.0f}; float zerovec[3]={0.0f,0.0f,0.0f};
@ -2185,7 +2185,7 @@ static void do_rough_end(float *loc, float mat[4][4], float t, float fac, float
VECADDFAC(state->co,state->co,mat[0],rough[0]); VECADDFAC(state->co,state->co,mat[0],rough[0]);
VECADDFAC(state->co,state->co,mat[1],rough[1]); VECADDFAC(state->co,state->co,mat[1],rough[1]);
} }
static void do_path_effectors(ParticleSimulationData *sim, int i, ParticleCacheKey *ca, int k, int steps, float *rootco, float effector, float dfra, float UNUSED(cfra), float *length, float *vec) static void do_path_effectors(ParticleSimulationData *sim, int i, ParticleCacheKey *ca, int k, int steps, float *UNUSED(rootco), float effector, float UNUSED(dfra), float UNUSED(cfra), float *length, float *vec)
{ {
float force[3] = {0.0f,0.0f,0.0f}; float force[3] = {0.0f,0.0f,0.0f};
ParticleKey eff_key; ParticleKey eff_key;

14
source/blender/blenkernel/intern/seqeffects.c
View File

@ -524,7 +524,7 @@ static void do_alphaover_effect_float(float facf0, float facf1, int x, int y,
} }
static struct ImBuf * do_alphaover_effect( static struct ImBuf * do_alphaover_effect(
Main *bmain, Scene *UNUSED(scene), Sequence *UNUSED(seq), float UNUSED(cfra), Main *UNUSED(bmain), Scene *UNUSED(scene), Sequence *UNUSED(seq), float UNUSED(cfra),
float facf0, float facf1, int x, int y, float facf0, float facf1, int x, int y,
int UNUSED(preview_render_size), int UNUSED(preview_render_size),
struct ImBuf *ibuf1, struct ImBuf *ibuf2, struct ImBuf *ibuf1, struct ImBuf *ibuf2,
@ -2633,7 +2633,7 @@ static void copy_glow_effect(Sequence *dst, Sequence *src)
//void do_glow_effect(Cast *cast, float facf0, float facf1, int xo, int yo, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *outbuf, ImBuf *use) //void do_glow_effect(Cast *cast, float facf0, float facf1, int xo, int yo, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *outbuf, ImBuf *use)
static void do_glow_effect_byte(Sequence *seq, float facf0, float UNUSED(facf1), static void do_glow_effect_byte(Sequence *seq, float facf0, float UNUSED(facf1),
int x, int y, char *rect1, int x, int y, char *rect1,
char *rect2, char *out) char *UNUSED(rect2), char *out)
{ {
unsigned char *outbuf=(unsigned char *)out; unsigned char *outbuf=(unsigned char *)out;
unsigned char *inbuf=(unsigned char *)rect1; unsigned char *inbuf=(unsigned char *)rect1;
@ -2648,7 +2648,7 @@ static void do_glow_effect_byte(Sequence *seq, float facf0, float UNUSED(facf1),
static void do_glow_effect_float(Sequence *seq, float facf0, float UNUSED(facf1), static void do_glow_effect_float(Sequence *seq, float facf0, float UNUSED(facf1),
int x, int y, int x, int y,
float *rect1, float *rect2, float *out) float *rect1, float *UNUSED(rect2), float *out)
{ {
float *outbuf = out; float *outbuf = out;
float *inbuf = rect1; float *inbuf = rect1;
@ -2822,8 +2822,8 @@ static struct ImBuf * do_multicam(
Main *bmain, Scene *scene, Sequence *seq, float cfra, Main *bmain, Scene *scene, Sequence *seq, float cfra,
float UNUSED(facf0), float UNUSED(facf1), int x, int y, float UNUSED(facf0), float UNUSED(facf1), int x, int y,
int preview_render_size, int preview_render_size,
struct ImBuf *ibuf1, struct ImBuf *ibuf2, struct ImBuf *UNUSED(ibuf1), struct ImBuf *UNUSED(ibuf2),
struct ImBuf *ibuf3) struct ImBuf *UNUSED(ibuf3))
{ {
struct ImBuf * i; struct ImBuf * i;
struct ImBuf * out; struct ImBuf * out;
@ -2914,7 +2914,7 @@ static int early_out_speed(struct Sequence *UNUSED(seq),
} }
static void store_icu_yrange_speed(struct Sequence * seq, static void store_icu_yrange_speed(struct Sequence * seq,
short adrcode, float * ymin, float * ymax) short UNUSED(adrcode), float * ymin, float * ymax)
{ {
SpeedControlVars * v = (SpeedControlVars *)seq->effectdata; SpeedControlVars * v = (SpeedControlVars *)seq->effectdata;
@ -3091,7 +3091,7 @@ static int early_out_mul_input2(struct Sequence *UNUSED(seq),
} }
static void store_icu_yrange_noop(struct Sequence * UNUSED(seq), static void store_icu_yrange_noop(struct Sequence * UNUSED(seq),
short adrcode, float * ymin, float * ymax) short UNUSED(adrcode), float *UNUSED(ymin), float *UNUSED(ymax))
{ {
/* defaults are fine */ /* defaults are fine */
} }

22
source/blender/blenkernel/intern/softbody.c
View File

@ -678,7 +678,7 @@ static void add_mesh_quad_diag_springs(Object *ob)
} }
} }
static void add_2nd_order_roller(Object *ob,float stiffness,int *counter, int addsprings) static void add_2nd_order_roller(Object *ob,float UNUSED(stiffness), int *counter, int addsprings)
{ {
/*assume we have a softbody*/ /*assume we have a softbody*/
SoftBody *sb= ob->soft; /* is supposed to be there */ SoftBody *sb= ob->soft; /* is supposed to be there */
@ -1029,7 +1029,7 @@ static int query_external_colliders(Scene *scene, Object *me)
/* +++ the aabb "force" section*/ /* +++ the aabb "force" section*/
static int sb_detect_aabb_collisionCached( float force[3], unsigned int par_layer,struct Object *vertexowner,float UNUSED(time)) static int sb_detect_aabb_collisionCached( float UNUSED(force[3]), unsigned int UNUSED(par_layer),struct Object *vertexowner,float UNUSED(time))
{ {
Object *ob; Object *ob;
SoftBody *sb=vertexowner->soft; SoftBody *sb=vertexowner->soft;
@ -1094,7 +1094,7 @@ static int sb_detect_aabb_collisionCached( float force[3], unsigned int par_laye
/* +++ the face external section*/ /* +++ the face external section*/
static int sb_detect_face_pointCached(float face_v1[3],float face_v2[3],float face_v3[3],float *damp, static int sb_detect_face_pointCached(float face_v1[3],float face_v2[3],float face_v3[3],float *damp,
float force[3], unsigned int par_layer,struct Object *vertexowner,float time) float force[3], unsigned int UNUSED(par_layer),struct Object *vertexowner,float time)
{ {
Object *ob; Object *ob;
GHash *hash; GHash *hash;
@ -1192,7 +1192,7 @@ static int sb_detect_face_pointCached(float face_v1[3],float face_v2[3],float fa
static int sb_detect_face_collisionCached(float face_v1[3],float face_v2[3],float face_v3[3],float *damp, static int sb_detect_face_collisionCached(float face_v1[3],float face_v2[3],float face_v3[3],float *damp,
float force[3], unsigned int par_layer,struct Object *vertexowner,float time) float force[3], unsigned int UNUSED(par_layer),struct Object *vertexowner,float time)
{ {
Object *ob; Object *ob;
GHash *hash; GHash *hash;
@ -1418,7 +1418,7 @@ static void scan_for_ext_face_forces(Object *ob,float timenow)
/* +++ the spring external section*/ /* +++ the spring external section*/
static int sb_detect_edge_collisionCached(float edge_v1[3],float edge_v2[3],float *damp, static int sb_detect_edge_collisionCached(float edge_v1[3],float edge_v2[3],float *damp,
float force[3], unsigned int par_layer,struct Object *vertexowner,float time) float force[3], unsigned int UNUSED(par_layer),struct Object *vertexowner,float time)
{ {
Object *ob; Object *ob;
GHash *hash; GHash *hash;
@ -1659,7 +1659,7 @@ static void *exec_scan_for_ext_spring_forces(void *data)
return 0; return 0;
} }
static void sb_sfesf_threads_run(Scene *scene, struct Object *ob, float timenow,int totsprings,int *ptr_to_break_func()) static void sb_sfesf_threads_run(Scene *scene, struct Object *ob, float timenow,int totsprings,int *UNUSED(ptr_to_break_func()))
{ {
ListBase *do_effector = NULL; ListBase *do_effector = NULL;
ListBase threads; ListBase threads;
@ -1749,7 +1749,7 @@ static int choose_winner(float*w, float* pos,float*a,float*b,float*c,float*ca,fl
static int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3], float *damp, static int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3], float *damp,
float force[3], unsigned int par_layer,struct Object *vertexowner, float force[3], unsigned int UNUSED(par_layer), struct Object *vertexowner,
float time,float vel[3], float *intrusion) float time,float vel[3], float *intrusion)
{ {
Object *ob= NULL; Object *ob= NULL;
@ -2084,7 +2084,7 @@ static void dfdv_goal(int ia, int ic,float factor)
for(i=0;i<3;i++) nlMatrixAdd(ia+i,ic+i,factor); for(i=0;i<3;i++) nlMatrixAdd(ia+i,ic+i,factor);
} }
*/ */
static void sb_spring_force(Object *ob,int bpi,BodySpring *bs,float iks,float forcetime,int nl_flags) static void sb_spring_force(Object *ob,int bpi,BodySpring *bs,float iks,float UNUSED(forcetime), int nl_flags)
{ {
SoftBody *sb= ob->soft; /* is supposed to be there */ SoftBody *sb= ob->soft; /* is supposed to be there */
BodyPoint *bp1,*bp2; BodyPoint *bp1,*bp2;
@ -2175,7 +2175,7 @@ static void sb_spring_force(Object *ob,int bpi,BodySpring *bs,float iks,float fo
/* since this is definitely the most CPU consuming task here .. try to spread it */ /* since this is definitely the most CPU consuming task here .. try to spread it */
/* core function _softbody_calc_forces_slice_in_a_thread */ /* core function _softbody_calc_forces_slice_in_a_thread */
/* result is int to be able to flag user break */ /* result is int to be able to flag user break */
static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, float forcetime, float timenow,int ifirst,int ilast,int *ptr_to_break_func(),ListBase *do_effector,int do_deflector,float fieldfactor, float windfactor) static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, float forcetime, float timenow,int ifirst,int ilast,int *UNUSED(ptr_to_break_func()),ListBase *do_effector,int do_deflector,float fieldfactor, float windfactor)
{ {
float iks; float iks;
int bb,do_selfcollision,do_springcollision,do_aero; int bb,do_selfcollision,do_springcollision,do_aero;
@ -2386,7 +2386,7 @@ static void *exec_softbody_calc_forces(void *data)
return 0; return 0;
} }
static void sb_cf_threads_run(Scene *scene, Object *ob, float forcetime, float timenow,int totpoint,int *ptr_to_break_func(),struct ListBase *do_effector,int do_deflector,float fieldfactor, float windfactor) static void sb_cf_threads_run(Scene *scene, Object *ob, float forcetime, float timenow,int totpoint,int *UNUSED(ptr_to_break_func()),struct ListBase *do_effector,int do_deflector,float fieldfactor, float windfactor)
{ {
ListBase threads; ListBase threads;
SB_thread_context *sb_threads; SB_thread_context *sb_threads;
@ -2444,7 +2444,7 @@ static void sb_cf_threads_run(Scene *scene, Object *ob, float forcetime, float t
MEM_freeN(sb_threads); MEM_freeN(sb_threads);
} }
static void softbody_calc_forcesEx(Scene *scene, Object *ob, float forcetime, float timenow, int nl_flags) static void softbody_calc_forcesEx(Scene *scene, Object *ob, float forcetime, float timenow, int UNUSED(nl_flags))
{ {
/* rule we never alter free variables :bp->vec bp->pos in here ! /* rule we never alter free variables :bp->vec bp->pos in here !
* this will ruin adaptive stepsize AKA heun! (BM) * this will ruin adaptive stepsize AKA heun! (BM)

2
source/blender/blenkernel/intern/sound.c
View File

@ -110,6 +110,8 @@ void sound_init(struct Main *bmain)
#ifdef WITH_JACK #ifdef WITH_JACK
AUD_setSyncCallback(sound_sync_callback, bmain); AUD_setSyncCallback(sound_sync_callback, bmain);
#else
(void)bmain; /* unused */
#endif #endif
} }

8
source/blender/blenkernel/intern/subsurf_ccg.c
View File

@ -83,13 +83,13 @@ static void *arena_realloc(CCGAllocatorHDL a, void *ptr, int newSize, int oldSiz
} }
return p2; return p2;
} }
static void arena_free(CCGAllocatorHDL a, void *ptr) { static void arena_free(CCGAllocatorHDL UNUSED(a), void *UNUSED(ptr)) {
} }
static void arena_release(CCGAllocatorHDL a) { static void arena_release(CCGAllocatorHDL a) {
BLI_memarena_free(a); BLI_memarena_free(a);
} }
static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels, int useAging, int useArena, int useFlatSubdiv) { static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels, int useAging, int useArena, int UNUSED(useFlatSubdiv)) {
CCGMeshIFC ifc; CCGMeshIFC ifc;
CCGSubSurf *ccgSS; CCGSubSurf *ccgSS;
@ -1146,7 +1146,7 @@ static void ccgDM_drawVerts(DerivedMesh *dm) {
ccgFaceIterator_free(fi); ccgFaceIterator_free(fi);
glEnd(); glEnd();
} }
static void ccgDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int drawAllEdges) { static void ccgDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int UNUSED(drawAllEdges)) {
CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm; CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
CCGSubSurf *ss = ccgdm->ss; CCGSubSurf *ss = ccgdm->ss;
CCGEdgeIterator *ei = ccgSubSurf_getEdgeIterator(ss); CCGEdgeIterator *ei = ccgSubSurf_getEdgeIterator(ss);
@ -1514,7 +1514,7 @@ static void ccgDM_drawFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, void *a
dm->drawMappedFacesGLSL(dm, setMaterial, NULL, NULL); dm->drawMappedFacesGLSL(dm, setMaterial, NULL, NULL);
} }
static void ccgDM_drawFacesColored(DerivedMesh *dm, int useTwoSided, unsigned char *col1, unsigned char *col2) { static void ccgDM_drawFacesColored(DerivedMesh *dm, int UNUSED(useTwoSided), unsigned char *col1, unsigned char *col2) {
CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm; CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
CCGSubSurf *ss = ccgdm->ss; CCGSubSurf *ss = ccgdm->ss;
CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss); CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss);

34
source/blender/editors/animation/keyframes_edit.c
View File

@ -541,7 +541,7 @@ static short ok_bezier_framerange(KeyframeEditData *ked, BezTriple *bezt)
return ok; return ok;
} }
static short ok_bezier_selected(KeyframeEditData *ked, BezTriple *bezt) static short ok_bezier_selected(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
/* this macro checks all beztriple handles for selection... /* this macro checks all beztriple handles for selection...
* only one of the verts has to be selected for this to be ok... * only one of the verts has to be selected for this to be ok...
@ -677,7 +677,7 @@ void bezt_remap_times(KeyframeEditData *ked, BezTriple *bezt)
/* Transform */ /* Transform */
/* snaps the keyframe to the nearest frame */ /* snaps the keyframe to the nearest frame */
static short snap_bezier_nearest(KeyframeEditData *ked, BezTriple *bezt) static short snap_bezier_nearest(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if (bezt->f2 & SELECT) if (bezt->f2 & SELECT)
bezt->vec[1][0]= (float)(floor(bezt->vec[1][0]+0.5)); bezt->vec[1][0]= (float)(floor(bezt->vec[1][0]+0.5));
@ -713,7 +713,7 @@ static short snap_bezier_nearmarker(KeyframeEditData *ked, BezTriple *bezt)
} }
/* make the handles have the same value as the key */ /* make the handles have the same value as the key */
static short snap_bezier_horizontal(KeyframeEditData *ked, BezTriple *bezt) static short snap_bezier_horizontal(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if (bezt->f2 & SELECT) { if (bezt->f2 & SELECT) {
bezt->vec[0][1]= bezt->vec[2][1]= bezt->vec[1][1]; bezt->vec[0][1]= bezt->vec[2][1]= bezt->vec[1][1];
@ -768,7 +768,7 @@ static short mirror_bezier_cframe(KeyframeEditData *ked, BezTriple *bezt)
return 0; return 0;
} }
static short mirror_bezier_yaxis(KeyframeEditData *ked, BezTriple *bezt) static short mirror_bezier_yaxis(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
float diff; float diff;
@ -780,7 +780,7 @@ static short mirror_bezier_yaxis(KeyframeEditData *ked, BezTriple *bezt)
return 0; return 0;
} }
static short mirror_bezier_xaxis(KeyframeEditData *ked, BezTriple *bezt) static short mirror_bezier_xaxis(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
float diff; float diff;
@ -841,7 +841,7 @@ KeyframeEditFunc ANIM_editkeyframes_mirror(short type)
/* Settings */ /* Settings */
/* Sets the selected bezier handles to type 'auto' */ /* Sets the selected bezier handles to type 'auto' */
static short set_bezier_auto(KeyframeEditData *ked, BezTriple *bezt) static short set_bezier_auto(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if((bezt->f1 & SELECT) || (bezt->f3 & SELECT)) { if((bezt->f1 & SELECT) || (bezt->f3 & SELECT)) {
if (bezt->f1 & SELECT) bezt->h1= HD_AUTO; /* the secret code for auto */ if (bezt->f1 & SELECT) bezt->h1= HD_AUTO; /* the secret code for auto */
@ -859,7 +859,7 @@ static short set_bezier_auto(KeyframeEditData *ked, BezTriple *bezt)
} }
/* Sets the selected bezier handles to type 'vector' */ /* Sets the selected bezier handles to type 'vector' */
static short set_bezier_vector(KeyframeEditData *ked, BezTriple *bezt) static short set_bezier_vector(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if ((bezt->f1 & SELECT) || (bezt->f3 & SELECT)) { if ((bezt->f1 & SELECT) || (bezt->f3 & SELECT)) {
if (bezt->f1 & SELECT) bezt->h1= HD_VECT; if (bezt->f1 & SELECT) bezt->h1= HD_VECT;
@ -879,7 +879,7 @@ static short set_bezier_vector(KeyframeEditData *ked, BezTriple *bezt)
/* Queries if the handle should be set to 'free' or 'align' */ /* Queries if the handle should be set to 'free' or 'align' */
// NOTE: this was used for the 'toggle free/align' option // NOTE: this was used for the 'toggle free/align' option
// currently this isn't used, but may be restored later // currently this isn't used, but may be restored later
static short bezier_isfree(KeyframeEditData *ked, BezTriple *bezt) static short bezier_isfree(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if ((bezt->f1 & SELECT) && (bezt->h1)) return 1; if ((bezt->f1 & SELECT) && (bezt->h1)) return 1;
if ((bezt->f3 & SELECT) && (bezt->h2)) return 1; if ((bezt->f3 & SELECT) && (bezt->h2)) return 1;
@ -887,7 +887,7 @@ static short bezier_isfree(KeyframeEditData *ked, BezTriple *bezt)
} }
/* Sets selected bezier handles to type 'align' */ /* Sets selected bezier handles to type 'align' */
static short set_bezier_align(KeyframeEditData *ked, BezTriple *bezt) static short set_bezier_align(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if (bezt->f1 & SELECT) bezt->h1= HD_ALIGN; if (bezt->f1 & SELECT) bezt->h1= HD_ALIGN;
if (bezt->f3 & SELECT) bezt->h2= HD_ALIGN; if (bezt->f3 & SELECT) bezt->h2= HD_ALIGN;
@ -895,7 +895,7 @@ static short set_bezier_align(KeyframeEditData *ked, BezTriple *bezt)
} }
/* Sets selected bezier handles to type 'free' */ /* Sets selected bezier handles to type 'free' */
static short set_bezier_free(KeyframeEditData *ked, BezTriple *bezt) static short set_bezier_free(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if (bezt->f1 & SELECT) bezt->h1= HD_FREE; if (bezt->f1 & SELECT) bezt->h1= HD_FREE;
if (bezt->f3 & SELECT) bezt->h2= HD_FREE; if (bezt->f3 & SELECT) bezt->h2= HD_FREE;
@ -925,21 +925,21 @@ KeyframeEditFunc ANIM_editkeyframes_handles(short code)
/* ------- */ /* ------- */
static short set_bezt_constant(KeyframeEditData *ked, BezTriple *bezt) static short set_bezt_constant(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if (bezt->f2 & SELECT) if (bezt->f2 & SELECT)
bezt->ipo= BEZT_IPO_CONST; bezt->ipo= BEZT_IPO_CONST;
return 0; return 0;
} }
static short set_bezt_linear(KeyframeEditData *ked, BezTriple *bezt) static short set_bezt_linear(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if (bezt->f2 & SELECT) if (bezt->f2 & SELECT)
bezt->ipo= BEZT_IPO_LIN; bezt->ipo= BEZT_IPO_LIN;
return 0; return 0;
} }
static short set_bezt_bezier(KeyframeEditData *ked, BezTriple *bezt) static short set_bezt_bezier(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if (bezt->f2 & SELECT) if (bezt->f2 & SELECT)
bezt->ipo= BEZT_IPO_BEZ; bezt->ipo= BEZT_IPO_BEZ;
@ -962,21 +962,21 @@ KeyframeEditFunc ANIM_editkeyframes_ipo(short code)
/* ------- */ /* ------- */
static short set_keytype_keyframe(KeyframeEditData *ked, BezTriple *bezt) static short set_keytype_keyframe(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if (bezt->f2 & SELECT) if (bezt->f2 & SELECT)
BEZKEYTYPE(bezt)= BEZT_KEYTYPE_KEYFRAME; BEZKEYTYPE(bezt)= BEZT_KEYTYPE_KEYFRAME;
return 0; return 0;
} }
static short set_keytype_breakdown(KeyframeEditData *ked, BezTriple *bezt) static short set_keytype_breakdown(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if (bezt->f2 & SELECT) if (bezt->f2 & SELECT)
BEZKEYTYPE(bezt)= BEZT_KEYTYPE_BREAKDOWN; BEZKEYTYPE(bezt)= BEZT_KEYTYPE_BREAKDOWN;
return 0; return 0;
} }
static short set_keytype_extreme(KeyframeEditData *ked, BezTriple *bezt) static short set_keytype_extreme(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
if (bezt->f2 & SELECT) if (bezt->f2 & SELECT)
BEZKEYTYPE(bezt)= BEZT_KEYTYPE_EXTREME; BEZKEYTYPE(bezt)= BEZT_KEYTYPE_EXTREME;
@ -1038,7 +1038,7 @@ static short select_bezier_subtract(KeyframeEditData *ked, BezTriple *bezt)
return 0; return 0;
} }
static short select_bezier_invert(KeyframeEditData *ked, BezTriple *bezt) static short select_bezier_invert(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
{ {
/* Invert the selection for the whole bezier triple */ /* Invert the selection for the whole bezier triple */
bezt->f2 ^= SELECT; bezt->f2 ^= SELECT;

10
source/blender/editors/armature/meshlaplacian.c
View File

@ -61,7 +61,7 @@
/* ************* XXX *************** */ /* ************* XXX *************** */
static void waitcursor(int val) {} static void waitcursor(int UNUSED(val)) {}
static void progress_bar(int UNUSED(dummy_val), const char *UNUSED(dummy)) {} static void progress_bar(int UNUSED(dummy_val), const char *UNUSED(dummy)) {}
static void start_progress_bar() {} static void start_progress_bar() {}
static void end_progress_bar() {} static void end_progress_bar() {}
@ -398,7 +398,7 @@ typedef struct BVHCallbackUserData {
LaplacianSystem *sys; LaplacianSystem *sys;
} BVHCallbackUserData; } BVHCallbackUserData;
static void bvh_callback(void *userdata, int index, const BVHTreeRay *ray, BVHTreeRayHit *hit) static void bvh_callback(void *userdata, int index, const BVHTreeRay *UNUSED(ray), BVHTreeRayHit *hit)
{ {
BVHCallbackUserData *data = (struct BVHCallbackUserData*)userdata; BVHCallbackUserData *data = (struct BVHCallbackUserData*)userdata;
MFace *mf = data->sys->heat.mface + index; MFace *mf = data->sys->heat.mface + index;
@ -1401,7 +1401,7 @@ static void meshdeform_bind_floodfill(MeshDeformBind *mdb)
MEM_freeN(stack); MEM_freeN(stack);
} }
static float meshdeform_boundary_phi(MeshDeformBind *mdb, MDefBoundIsect *isect, int cagevert) static float meshdeform_boundary_phi(MeshDeformBind *UNUSED(mdb), MDefBoundIsect *isect, int cagevert)
{ {
int a; int a;
@ -1412,7 +1412,7 @@ static float meshdeform_boundary_phi(MeshDeformBind *mdb, MDefBoundIsect *isect,
return 0.0f; return 0.0f;
} }
static float meshdeform_interp_w(MeshDeformBind *mdb, float *gridvec, float *vec, int cagevert) static float meshdeform_interp_w(MeshDeformBind *mdb, float *gridvec, float *UNUSED(vec), int UNUSED(cagevert))
{ {
float dvec[3], ivec[3], wx, wy, wz, result=0.0f; float dvec[3], ivec[3], wx, wy, wz, result=0.0f;
float weight, totweight= 0.0f; float weight, totweight= 0.0f;
@ -1563,7 +1563,7 @@ static void meshdeform_matrix_add_semibound_phi(MeshDeformBind *mdb, int x, int
} }
} }
static void meshdeform_matrix_add_exterior_phi(MeshDeformBind *mdb, int x, int y, int z, int cagevert) static void meshdeform_matrix_add_exterior_phi(MeshDeformBind *mdb, int x, int y, int z, int UNUSED(cagevert))
{ {
float phi, totweight; float phi, totweight;
int i, a, acenter; int i, a, acenter;

10
source/blender/editors/armature/reeb.c
View File

@ -442,7 +442,7 @@ void flipArc(ReebArc *arc)
} }
#ifdef DEBUG_REEB_NODE #ifdef DEBUG_REEB_NODE
void NodeDegreeDecrement(ReebGraph *rg, ReebNode *node) void NodeDegreeDecrement(ReebGraph *UNUSED(rg), ReebNode *node)
{ {
node->degree--; node->degree--;
@ -452,7 +452,7 @@ void NodeDegreeDecrement(ReebGraph *rg, ReebNode *node)
// } // }
} }
void NodeDegreeIncrement(ReebGraph *rg, ReebNode *node) void NodeDegreeIncrement(ReebGraph *UNUSED(rg), ReebNode *node)
{ {
// if (node->degree == 0) // if (node->degree == 0)
// { // {
@ -523,7 +523,7 @@ void verifyNodeDegree(ReebGraph *rg)
#endif #endif
} }
void verifyBucketsArc(ReebGraph *rg, ReebArc *arc) void verifyBucketsArc(ReebGraph *UNUSED(rg), ReebArc *arc)
{ {
ReebNode *head = (ReebNode*)arc->head; ReebNode *head = (ReebNode*)arc->head;
ReebNode *tail = (ReebNode*)arc->tail; ReebNode *tail = (ReebNode*)arc->tail;
@ -1723,7 +1723,7 @@ int filterCyclesReebGraph(ReebGraph *rg, float UNUSED(distance_threshold))
return filtered; return filtered;
} }
int filterSmartReebGraph(ReebGraph *rg, float UNUSED(threshold)) int filterSmartReebGraph(ReebGraph *UNUSED(rg), float UNUSED(threshold))
{ {
int value = 0; int value = 0;
#if 0 //XXX #if 0 //XXX
@ -2180,7 +2180,7 @@ void addFacetoArc(ReebArc *arc, EditFace *efa)
BLI_ghash_insert(arc->faces, efa, efa); BLI_ghash_insert(arc->faces, efa, efa);
} }
void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc) void mergeArcFaces(ReebGraph *UNUSED(rg), ReebArc *aDst, ReebArc *aSrc)
{ {
GHashIterator ghi; GHashIterator ghi;

1
source/blender/editors/mesh/mesh_data.c
View File

@ -288,7 +288,6 @@ static int layers_poll(bContext *C)
static int uv_texture_add_exec(bContext *C, wmOperator *UNUSED(op)) static int uv_texture_add_exec(bContext *C, wmOperator *UNUSED(op))
{ {
Scene *scene= CTX_data_scene(C);
Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data; Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
Mesh *me= ob->data; Mesh *me= ob->data;

10
source/blender/editors/physics/particle_edit.c
View File

@ -1125,7 +1125,7 @@ static void update_world_cos(Object *ob, PTCacheEdit *edit)
} }
} }
} }
static void update_velocities(Object *ob, PTCacheEdit *edit) static void update_velocities(PTCacheEdit *edit)
{ {
/*TODO: get frs_sec properly */ /*TODO: get frs_sec properly */
float vec1[3], vec2[3], frs_sec, dfra; float vec1[3], vec2[3], frs_sec, dfra;
@ -1208,7 +1208,7 @@ void PE_update_object(Scene *scene, Object *ob, int useflag)
if(edit->psys) if(edit->psys)
update_world_cos(ob, edit); update_world_cos(ob, edit);
if(pset->flag & PE_AUTO_VELOCITY) if(pset->flag & PE_AUTO_VELOCITY)
update_velocities(ob, edit); update_velocities(edit);
PE_hide_keys_time(scene, edit, CFRA); PE_hide_keys_time(scene, edit, CFRA);
/* regenerate path caches */ /* regenerate path caches */
@ -1243,7 +1243,7 @@ static void select_key(PEData *data, int point_index, int key_index)
point->flag |= PEP_EDIT_RECALC; point->flag |= PEP_EDIT_RECALC;
} }
static void select_keys(PEData *data, int point_index, int key_index) static void select_keys(PEData *data, int point_index, int UNUSED(key_index))
{ {
PTCacheEdit *edit = data->edit; PTCacheEdit *edit = data->edit;
PTCacheEditPoint *point = edit->points + point_index; PTCacheEditPoint *point = edit->points + point_index;
@ -3034,7 +3034,7 @@ static void brush_puff(PEData *data, int point_index)
} }
static void brush_weight(PEData *data, float UNUSED(mat[][4]), float imat[][4], int point_index, int key_index, PTCacheEditKey *key) static void brush_weight(PEData *data, float UNUSED(mat[][4]), float UNUSED(imat[][4]), int point_index, int key_index, PTCacheEditKey *UNUSED(key))
{ {
/* roots have full weight allways */ /* roots have full weight allways */
if(key_index) { if(key_index) {
@ -3048,7 +3048,7 @@ static void brush_weight(PEData *data, float UNUSED(mat[][4]), float imat[][4],
} }
} }
static void brush_smooth_get(PEData *data, float mat[][4], float imat[][4], int point_index, int key_index, PTCacheEditKey *key) static void brush_smooth_get(PEData *data, float mat[][4], float UNUSED(imat[][4]), int UNUSED(point_index), int key_index, PTCacheEditKey *key)
{ {
if(key_index) { if(key_index) {
float dvec[3]; float dvec[3];

2
source/blender/editors/physics/physics_fluid.c
View File

@ -342,7 +342,7 @@ static void free_all_fluidobject_channels(ListBase *fobjects)
} }
} }
static void fluid_init_all_channels(bContext *C, Object *fsDomain, FluidsimSettings *domainSettings, FluidAnimChannels *channels, ListBase *fobjects) static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), FluidsimSettings *domainSettings, FluidAnimChannels *channels, ListBase *fobjects)
{ {
Scene *scene = CTX_data_scene(C); Scene *scene = CTX_data_scene(C);
Base *base; Base *base;

1
source/blender/editors/sculpt_paint/paint_undo.c
View File

@ -31,6 +31,7 @@
#include "BLI_listbase.h" #include "BLI_listbase.h"
#include "BKE_utildefines.h"
#include "BKE_context.h" #include "BKE_context.h"
#include "BKE_global.h" #include "BKE_global.h"

8
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -867,6 +867,8 @@ static void calc_area_normal(Sculpt *sd, SculptSession *ss, float an[3], PBVHNod
float out_flip[3] = {0.0f, 0.0f, 0.0f}; float out_flip[3] = {0.0f, 0.0f, 0.0f};
(void)sd; /* unused w/o openmp */
zero_v3(an); zero_v3(an);
#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
@ -1667,6 +1669,8 @@ static void calc_flatten_center(Sculpt *sd, SculptSession *ss, PBVHNode **nodes,
float count = 0; float count = 0;
(void)sd; /* unused w/o openmp */
zero_v3(fc); zero_v3(fc);
#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
@ -1721,6 +1725,8 @@ static void calc_area_normal_and_flatten_center(Sculpt *sd, SculptSession *ss, P
// fc // fc
float count = 0; float count = 0;
(void)sd; /* unused w/o openmp */
// an // an
zero_v3(an); zero_v3(an);
@ -2536,6 +2542,8 @@ static void sculpt_combine_proxies(Sculpt *sd, SculptSession *ss)
calculate multiple modifications to the mesh when symmetry is enabled. */ calculate multiple modifications to the mesh when symmetry is enabled. */
static void calc_brushdata_symm(Sculpt *sd, StrokeCache *cache, const char symm, const char axis, const float angle, const float UNUSED(feather)) static void calc_brushdata_symm(Sculpt *sd, StrokeCache *cache, const char symm, const char axis, const float angle, const float UNUSED(feather))
{ {
(void)sd; /* unused */
flip_coord(cache->location, cache->true_location, symm); flip_coord(cache->location, cache->true_location, symm);
flip_coord(cache->grab_delta_symmetry, cache->grab_delta, symm); flip_coord(cache->grab_delta_symmetry, cache->grab_delta, symm);
flip_coord(cache->view_normal, cache->true_view_normal, symm); flip_coord(cache->view_normal, cache->true_view_normal, symm);

9
source/blender/imbuf/intern/anim.c
View File

@ -63,6 +63,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_userdef_types.h" #include "DNA_userdef_types.h"
#include "BKE_utildefines.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_depsgraph.h" #include "BKE_depsgraph.h"
@ -214,14 +215,14 @@ int ismovie(char *name) {
#else #else
int ismovie(char *name) { int ismovie(char *UNUSED(name)) {
return 0; return 0;
} }
/* never called, just keep the linker happy */ /* never called, just keep the linker happy */
static int startmovie(struct anim * anim) { return 1; } static int startmovie(struct anim *UNUSED(anim)) { return 1; }
static ImBuf * movie_fetchibuf(struct anim * anim, int position) { return NULL; } static ImBuf * movie_fetchibuf(struct anim *UNUSED(anim), int UNUSED(position)) { return NULL; }
static void free_anim_movie(struct anim * anim) { ; } static void free_anim_movie(struct anim *UNUSED(anim)) { ; }
#endif #endif

4
source/blender/imbuf/intern/bmp.c
View File

@ -109,6 +109,8 @@ struct ImBuf *imb_bmp_decode(unsigned char *mem, size_t size, int flags)
unsigned char *bmp, *rect; unsigned char *bmp, *rect;
unsigned short col; unsigned short col;
(void)size; /* unused */
if (checkbmp(mem) == 0) return(0); if (checkbmp(mem) == 0) return(0);
if ((mem[0] == 'B') && (mem[1] == 'M')) { if ((mem[0] == 'B') && (mem[1] == 'M')) {
@ -200,6 +202,8 @@ int imb_savebmp(struct ImBuf *ibuf, char *name, int flags) {
uchar *data; uchar *data;
FILE *ofile; FILE *ofile;
(void)flags; /* unused */
extrabytes = (4 - ibuf->x*3 % 4) % 4; extrabytes = (4 - ibuf->x*3 % 4) % 4;
bytesize = (ibuf->x * 3 + extrabytes) * ibuf->y; bytesize = (ibuf->x * 3 + extrabytes) * ibuf->y;

2
source/blender/imbuf/intern/cineon/cineon_dpx.c
View File

@ -126,6 +126,8 @@ static int imb_save_dpx_cineon(ImBuf *buf, char *filename, int use_cineon, int f
int index; int index;
float *fline; float *fline;
(void)flags; /* unused */
cineon_conversion_parameters(&conversion); cineon_conversion_parameters(&conversion);
/* /*

4
source/blender/imbuf/intern/cineon/cineonlib.c
View File

@ -185,6 +185,8 @@ dumpCineonImageInfo(CineonImageInformation* imageInfo) {
static void static void
fillCineonFormatInfo(CineonFile* cineon, CineonFormatInformation* formatInfo) { fillCineonFormatInfo(CineonFile* cineon, CineonFormatInformation* formatInfo) {
(void)cineon; /* unused */
formatInfo->interleave = 0; formatInfo->interleave = 0;
formatInfo->packing = 5; formatInfo->packing = 5;
formatInfo->signage = 0; formatInfo->signage = 0;
@ -239,6 +241,8 @@ static void
fillCineonOriginationInfo(CineonFile* cineon, fillCineonOriginationInfo(CineonFile* cineon,
CineonOriginationInformation* originInfo, CineonFileInformation* fileInfo) { CineonOriginationInformation* originInfo, CineonFileInformation* fileInfo) {
(void)cineon; /* unused */
originInfo->x_offset = htonl(0); originInfo->x_offset = htonl(0);
originInfo->y_offset = htonl(0); originInfo->y_offset = htonl(0);
strcpy(originInfo->file_name, fileInfo->file_name); strcpy(originInfo->file_name, fileInfo->file_name);

9
source/blender/imbuf/intern/cineon/dpxlib.c
View File

@ -39,6 +39,8 @@
static void static void
fillDpxChannelInfo(DpxFile* dpx, DpxChannelInformation* chan, int des) { fillDpxChannelInfo(DpxFile* dpx, DpxChannelInformation* chan, int des) {
(void)dpx; /* unused */
chan->signage = 0; chan->signage = 0;
chan->ref_low_data = htonl(0); chan->ref_low_data = htonl(0);
chan->ref_low_quantity = htonf(0.0); chan->ref_low_quantity = htonf(0.0);
@ -160,7 +162,12 @@ dumpDpxImageInfo(DpxImageInformation* imageInfo) {
static void static void
fillDpxOriginationInfo( fillDpxOriginationInfo(
DpxFile* dpx, DpxOriginationInformation* originInfo, DpxFileInformation* fileInfo) { DpxFile* dpx, DpxOriginationInformation* originInfo, DpxFileInformation* fileInfo)
{
/* unused */
(void)dpx;
(void)originInfo;
(void)fileInfo;
} }
static void static void

2
source/blender/imbuf/intern/filetype.c
View File

@ -45,7 +45,7 @@ static int imb_ftype_default(ImFileType *type, ImBuf *ibuf) { return (ibuf->ftyp
#if defined(__APPLE__) && defined(IMBUF_COCOA) #if defined(__APPLE__) && defined(IMBUF_COCOA)
static int imb_ftype_cocoa(ImFileType *type, ImBuf *ibuf) { return (ibuf->ftype & TIF); } static int imb_ftype_cocoa(ImFileType *type, ImBuf *ibuf) { return (ibuf->ftype & TIF); }
#endif #endif
static int imb_ftype_iris(ImFileType *type, ImBuf *ibuf) { return (ibuf->ftype == IMAGIC); } static int imb_ftype_iris(ImFileType *type, ImBuf *ibuf) { (void)type; return (ibuf->ftype == IMAGIC); }
#ifdef WITH_QUICKTIME #ifdef WITH_QUICKTIME
static int imb_ftype_quicktime(ImFileType *type, ImBuf *ibuf) { return 0; } // XXX static int imb_ftype_quicktime(ImFileType *type, ImBuf *ibuf) { return 0; } // XXX
#endif #endif

4
source/blender/imbuf/intern/iris.c
View File

@ -123,6 +123,7 @@ static int file_offset;
static unsigned short getshort(FILE *inf) static unsigned short getshort(FILE *inf)
{ {
unsigned char * buf; unsigned char * buf;
(void)inf; /* unused */
buf = file_data + file_offset; buf = file_data + file_offset;
file_offset += 2; file_offset += 2;
@ -133,6 +134,7 @@ static unsigned short getshort(FILE *inf)
static unsigned int getlong(FILE *inf) static unsigned int getlong(FILE *inf)
{ {
unsigned char * buf; unsigned char * buf;
(void)inf; /* unused */
buf = file_data + file_offset; buf = file_data + file_offset;
file_offset += 4; file_offset += 4;
@ -258,6 +260,8 @@ struct ImBuf *imb_loadiris(unsigned char *mem, size_t size, int flags)
int bpp, rle, cur, badorder; int bpp, rle, cur, badorder;
ImBuf * ibuf; ImBuf * ibuf;
(void)size; /* unused */
if(!imb_is_a_iris(mem)) return NULL; if(!imb_is_a_iris(mem)) return NULL;
/*printf("new iris\n");*/ /*printf("new iris\n");*/

2
source/blender/imbuf/intern/jp2.c
View File

@ -670,6 +670,8 @@ int imb_savejp2(struct ImBuf *ibuf, char *name, int flags) {
opj_event_mgr_t event_mgr; /* event manager */ opj_event_mgr_t event_mgr; /* event manager */
opj_image_t *image = NULL; opj_image_t *image = NULL;
(void)flags; /* unused */
/* /*
configure the event callbacks (not required) configure the event callbacks (not required)
setting of each callback is optionnal setting of each callback is optionnal

2
source/blender/imbuf/intern/jpeg.c
View File

@ -132,6 +132,7 @@ typedef my_source_mgr * my_src_ptr;
static void init_source(j_decompress_ptr cinfo) static void init_source(j_decompress_ptr cinfo)
{ {
(void)cinfo; /* unused */
} }
@ -165,6 +166,7 @@ static void skip_input_data(j_decompress_ptr cinfo, long num_bytes)
static void term_source(j_decompress_ptr cinfo) static void term_source(j_decompress_ptr cinfo)
{ {
(void)cinfo; /* unused */
} }
static void memory_source(j_decompress_ptr cinfo, unsigned char *buffer, size_t size) static void memory_source(j_decompress_ptr cinfo, unsigned char *buffer, size_t size)

23
source/blender/imbuf/intern/openexr/openexr_multi.h
View File

@ -67,24 +67,27 @@ void IMB_exr_close (void *handle);
/* ugly... but we only use it on pipeline.c, render module, now */ /* ugly... but we only use it on pipeline.c, render module, now */
void * IMB_exr_get_handle (void) {return NULL;} void * IMB_exr_get_handle (void) {return NULL;}
void IMB_exr_add_channel (void *handle, const char *layname, const char *channame, int xstride, int ystride, float *rect) {} void IMB_exr_add_channel (void *handle, const char *layname, const char *channame, int xstride, int ystride, float *rect) { (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
int IMB_exr_begin_read (void *handle, char *filename, int *width, int *height) {return 0;} int IMB_exr_begin_read (void *handle, char *filename, int *width, int *height) { (void)handle; (void)filename; (void)width; (void)height; return 0;}
void IMB_exr_begin_write (void *handle, char *filename, int width, int height, int compress) { (void)handle; (void)filename; (void)width; (void)height; (void)compress; } void IMB_exr_begin_write (void *handle, char *filename, int width, int height, int compress) { (void)handle; (void)filename; (void)width; (void)height; (void)compress; }
void IMB_exrtile_begin_write (void *handle, char *filename, int mipmap, int width, int height, int tilex, int tiley) {} void IMB_exrtile_begin_write (void *handle, char *filename, int mipmap, int width, int height, int tilex, int tiley) { (void)handle; (void)filename; (void)mipmap; (void)width; (void)height; (void)tilex; (void)tiley; }
void IMB_exr_set_channel (void *handle, char *layname, char *channame, int xstride, int ystride, float *rect) {} void IMB_exr_set_channel (void *handle, char *layname, char *channame, int xstride, int ystride, float *rect) { (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
void IMB_exr_read_channels (void *handle) {} void IMB_exr_read_channels (void *handle) { (void)handle; }
void IMB_exr_write_channels (void *handle) {} void IMB_exr_write_channels (void *handle) { (void)handle; }
void IMB_exrtile_write_channels (void *handle, int partx, int party, int level) {} void IMB_exrtile_write_channels (void *handle, int partx, int party, int level) { (void)handle; (void)partx; (void)party; (void)level; }
void IMB_exrtile_clear_channels (void *handle) {} void IMB_exrtile_clear_channels (void *handle) { (void)handle; }
void IMB_exr_multilayer_convert (void *handle, void *base, void IMB_exr_multilayer_convert (void *handle, void *base,
void * (*addlayer)(void *base, char *str), void * (*addlayer)(void *base, char *str),
void (*addpass)(void *base, void *lay, char *str, float *rect, int totchan, char *chan_id)) {} void (*addpass)(void *base, void *lay, char *str, float *rect, int totchan, char *chan_id))
{
(void)handle; (void)base; (void)addlayer; (void)addpass;
}
void IMB_exr_close (void *handle) {} void IMB_exr_close (void *handle) { (void)handle; }
#endif #endif

2
source/blender/imbuf/intern/radiance_hdr.c
View File

@ -340,6 +340,8 @@ int imb_savehdr(struct ImBuf *ibuf, char *name, int flags)
int y, width=ibuf->x, height=ibuf->y; int y, width=ibuf->x, height=ibuf->y;
unsigned char *cp= NULL; unsigned char *cp= NULL;
(void)flags; /* unused */
if (file==NULL) return 0; if (file==NULL) return 0;
writeHeader(file, width, height); writeHeader(file, width, height);

2
source/blender/imbuf/intern/targa.c
View File

@ -239,6 +239,8 @@ int imb_savetarga(struct ImBuf * ibuf, char *name, int flags)
FILE *fildes; FILE *fildes;
short ok = 0; short ok = 0;
(void)flags; /* unused */
if (ibuf == 0) return (0); if (ibuf == 0) return (0);
if (ibuf->rect == 0) return (0); if (ibuf->rect == 0) return (0);

2
source/blender/modifiers/intern/MOD_shapekey.c
View File

@ -86,6 +86,8 @@ static void deformMatricesEM(ModifierData *UNUSED(md), Object *ob,
float scale[3][3]; float scale[3][3];
int a; int a;
(void)vertexCos; /* unused */
if(kb && kb->totelem==numVerts && kb!=key->refkey) { if(kb && kb->totelem==numVerts && kb!=key->refkey) {
scale_m3_fl(scale, kb->curval); scale_m3_fl(scale, kb->curval);

3
source/blender/render/CMakeLists.txt
View File

@ -24,6 +24,9 @@
# #
# ***** END GPL LICENSE BLOCK ***** # ***** END GPL LICENSE BLOCK *****
# remove warning until render branch merged.
STRING(REGEX REPLACE "-Wunused-parameter" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp) FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp)
SET(INC SET(INC

4
source/blender/render/intern/source/pipeline.c
View File

@ -861,7 +861,7 @@ static void *ml_addlayer_cb(void *base, char *str)
BLI_strncpy(rl->name, str, EXR_LAY_MAXNAME); BLI_strncpy(rl->name, str, EXR_LAY_MAXNAME);
return rl; return rl;
} }
static void ml_addpass_cb(void *base, void *lay, char *str, float *rect, int totchan, char *chan_id) static void ml_addpass_cb(void *UNUSED(base), void *lay, char *str, float *rect, int totchan, char *chan_id)
{ {
RenderLayer *rl= lay; RenderLayer *rl= lay;
RenderPass *rpass= MEM_callocN(sizeof(RenderPass), "loaded pass"); RenderPass *rpass= MEM_callocN(sizeof(RenderPass), "loaded pass");
@ -2677,7 +2677,7 @@ static int is_rendering_allowed(Render *re)
return 1; return 1;
} }
static void update_physics_cache(Render *re, Scene *scene, int anim_init) static void update_physics_cache(Render *re, Scene *scene, int UNUSED(anim_init))
{ {
PTCacheBaker baker; PTCacheBaker baker;

2
source/blender/render/intern/source/pointdensity.c
View File

@ -253,7 +253,7 @@ static void cache_pointdensity(Render *re, Tex *tex)
} }
} }
static void free_pointdensity(Render *re, Tex *tex) static void free_pointdensity(Render *UNUSED(re), Tex *tex)
{ {
PointDensity *pd = tex->pd; PointDensity *pd = tex->pd;

2
source/blender/render/intern/source/volumetric.c
View File

@ -358,7 +358,7 @@ void vol_get_sigma_t(ShadeInput *shi, float *sigma_t, float *co)
/* phase function - determines in which directions the light /* phase function - determines in which directions the light
* is scattered in the volume relative to incoming direction * is scattered in the volume relative to incoming direction
* and view direction */ * and view direction */
float vol_get_phasefunc(ShadeInput *shi, float g, float *w, float *wp) float vol_get_phasefunc(ShadeInput *UNUSED(shi), float g, float *w, float *wp)
{ {
const float normalize = 0.25f; // = 1.f/4.f = M_PI/(4.f*M_PI) const float normalize = 0.25f; // = 1.f/4.f = M_PI/(4.f*M_PI)

1
source/blenderplayer/bad_level_call_stubs/stubs.c
View File

@ -42,6 +42,7 @@ struct CSG_FaceIteratorDescriptor;
struct CSG_VertexIteratorDescriptor; struct CSG_VertexIteratorDescriptor;
struct ColorBand; struct ColorBand;
struct CurveMapping; struct CurveMapping;
struct Curve;
struct EditBone; struct EditBone;
struct EditFace; struct EditFace;
struct EditMesh; struct EditMesh;

44
source/creator/creator.c
View File

@ -138,7 +138,7 @@ static void setCallbacks(void);
/* set breakpoints here when running in debug mode, useful to catch floating point errors */ /* set breakpoints here when running in debug mode, useful to catch floating point errors */
#if defined(__sgi) || defined(__linux__) || defined(_WIN32) || OSX_SSE_FPE #if defined(__sgi) || defined(__linux__) || defined(_WIN32) || OSX_SSE_FPE
static void fpe_handler(int sig) static void fpe_handler(int UNUSED(sig))
{ {
// printf("SIGFPE trapped\n"); // printf("SIGFPE trapped\n");
} }
@ -175,7 +175,7 @@ static void strip_quotes(char *str)
} }
#endif #endif
static int print_version(int argc, char **argv, void *data) static int print_version(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
printf (BLEND_VERSION_STRING_FMT); printf (BLEND_VERSION_STRING_FMT);
#ifdef BUILD_DATE #ifdef BUILD_DATE
@ -190,7 +190,7 @@ static int print_version(int argc, char **argv, void *data)
return 0; return 0;
} }
static int print_help(int argc, char **argv, void *data) static int print_help(int UNUSED(argc), char **UNUSED(argv), void *data)
{ {
bArgs *ba = (bArgs*)data; bArgs *ba = (bArgs*)data;
@ -317,30 +317,30 @@ double PIL_check_seconds_timer(void);
} }
}*/ }*/
static int end_arguments(int argc, char **argv, void *data) static int end_arguments(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
return -1; return -1;
} }
static int enable_python(int argc, char **argv, void *data) static int enable_python(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
G.f |= G_SCRIPT_AUTOEXEC; G.f |= G_SCRIPT_AUTOEXEC;
return 0; return 0;
} }
static int disable_python(int argc, char **argv, void *data) static int disable_python(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
G.f &= ~G_SCRIPT_AUTOEXEC; G.f &= ~G_SCRIPT_AUTOEXEC;
return 0; return 0;
} }
static int background_mode(int argc, char **argv, void *data) static int background_mode(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
G.background = 1; G.background = 1;
return 0; return 0;
} }
static int debug_mode(int argc, char **argv, void *data) static int debug_mode(int UNUSED(argc), char **UNUSED(argv), void *data)
{ {
G.f |= G_DEBUG; /* std output printf's */ G.f |= G_DEBUG; /* std output printf's */
printf(BLEND_VERSION_STRING_FMT); printf(BLEND_VERSION_STRING_FMT);
@ -354,7 +354,7 @@ static int debug_mode(int argc, char **argv, void *data)
return 0; return 0;
} }
static int set_fpe(int argc, char **argv, void *data) static int set_fpe(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
#if defined(__sgi) || defined(__linux__) || defined(_WIN32) || OSX_SSE_FPE #if defined(__sgi) || defined(__linux__) || defined(_WIN32) || OSX_SSE_FPE
/* zealous but makes float issues a heck of a lot easier to find! /* zealous but makes float issues a heck of a lot easier to find!
@ -379,7 +379,7 @@ static int set_fpe(int argc, char **argv, void *data)
return 0; return 0;
} }
static int playback_mode(int argc, char **argv, void *data) static int playback_mode(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
/* not if -b was given first */ /* not if -b was given first */
if (G.background == 0) { if (G.background == 0) {
@ -391,7 +391,7 @@ static int playback_mode(int argc, char **argv, void *data)
return -2; return -2;
} }
static int prefsize(int argc, char **argv, void *data) static int prefsize(int argc, char **argv, void *UNUSED(data))
{ {
int stax, stay, sizx, sizy; int stax, stay, sizx, sizy;
@ -410,19 +410,19 @@ static int prefsize(int argc, char **argv, void *data)
return 4; return 4;
} }
static int with_borders(int argc, char **argv, void *data) static int with_borders(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
WM_setinitialstate_normal(); WM_setinitialstate_normal();
return 0; return 0;
} }
static int without_borders(int argc, char **argv, void *data) static int without_borders(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
WM_setinitialstate_fullscreen(); WM_setinitialstate_fullscreen();
return 0; return 0;
} }
static int register_extension(int argc, char **argv, void *data) static int register_extension(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
#ifdef WIN32 #ifdef WIN32
char *path = BLI_argsArgv(data)[0]; char *path = BLI_argsArgv(data)[0];
@ -432,7 +432,7 @@ static int register_extension(int argc, char **argv, void *data)
return 0; return 0;
} }
static int no_joystick(int argc, char **argv, void *data) static int no_joystick(int UNUSED(argc), char **UNUSED(argv), void *data)
{ {
SYS_SystemHandle *syshandle = data; SYS_SystemHandle *syshandle = data;
@ -446,19 +446,19 @@ static int no_joystick(int argc, char **argv, void *data)
return 0; return 0;
} }
static int no_glsl(int argc, char **argv, void *data) static int no_glsl(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
GPU_extensions_disable(); GPU_extensions_disable();
return 0; return 0;
} }
static int no_audio(int argc, char **argv, void *data) static int no_audio(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
{ {
sound_force_device(0); sound_force_device(0);
return 0; return 0;
} }
static int set_audio(int argc, char **argv, void *data) static int set_audio(int argc, char **argv, void *UNUSED(data))
{ {
if (argc < 1) { if (argc < 1) {
printf("-setaudio require one argument\n"); printf("-setaudio require one argument\n");
@ -583,7 +583,7 @@ static int set_image_type(int argc, char **argv, void *data)
} }
} }
static int set_threads(int argc, char **argv, void *data) static int set_threads(int argc, char **argv, void *UNUSED(data))
{ {
if (argc >= 1) { if (argc >= 1) {
if(G.background) { if(G.background) {
@ -714,7 +714,7 @@ static int render_frame(int argc, char **argv, void *data)
} }
} }
static int render_animation(int argc, char **argv, void *data) static int render_animation(int UNUSED(argc), char **UNUSED(argv), void *data)
{ {
bContext *C = data; bContext *C = data;
if (CTX_data_scene(C)) { if (CTX_data_scene(C)) {
@ -848,7 +848,7 @@ static int run_python(int argc, char **argv, void *data)
#endif /* DISABLE_PYTHON */ #endif /* DISABLE_PYTHON */
} }
static int run_python_console(int argc, char **argv, void *data) static int run_python_console(int UNUSED(argc), char **argv, void *data)
{ {
#ifndef DISABLE_PYTHON #ifndef DISABLE_PYTHON
bContext *C = data; bContext *C = data;
@ -863,7 +863,7 @@ static int run_python_console(int argc, char **argv, void *data)
#endif /* DISABLE_PYTHON */ #endif /* DISABLE_PYTHON */
} }
static int load_file(int argc, char **argv, void *data) static int load_file(int UNUSED(argc), char **argv, void *data)
{ {
bContext *C = data; bContext *C = data;

3
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
View File

@ -284,8 +284,9 @@ void GPC_RenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
int width, int width,
int height) int height)
{ {
/*
STR_String tmpstr(text); STR_String tmpstr(text);
char* s = tmpstr.Ptr(); char* s = tmpstr.Ptr(); */
// Save and change OpenGL settings // Save and change OpenGL settings
int texture2D; int texture2D;