diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-02-17 15:05:09 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-17 15:05:09 +0300 |
commit | 1b25f48542b85f61e9fb6044e5ec0b1985a7906a (patch) | |
tree | 7ae4432ef958a307b65dc9a1391393a603b6001d | |
parent | cf6f6c1c5e3971e0d4e023bd8267b9430e46f598 (diff) |
clear some unused warnings
-rw-r--r-- | source/blender/blenfont/BLF_api.h | 2 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_lang.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.c | 12 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_kdopbvh.c | 3 | ||||
-rw-r--r-- | source/blender/blenlib/intern/bpath.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/file_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 12 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.c | 6 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap.c | 7 |
11 files changed, 30 insertions, 26 deletions
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h index b696c64023d..d26c5166ddc 100644 --- a/source/blender/blenfont/BLF_api.h +++ b/source/blender/blenfont/BLF_api.h @@ -177,6 +177,8 @@ void BLF_lang_set(const char *); /* Set the current encoding name. */ void BLF_lang_encoding_name(const char *str); +void BLF_lang_encoding(const char *str); + /* Add a path to the font dir paths. */ void BLF_dir_add(const char *path); diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c index 610e8750bc1..a9322944ce5 100644 --- a/source/blender/blenfont/intern/blf_lang.c +++ b/source/blender/blenfont/intern/blf_lang.c @@ -99,7 +99,7 @@ void BLF_lang_set(const char *str) BLI_strncpy(global_language, str, sizeof(global_language)); } -static void BLF_lang_encoding(const char *str) +void BLF_lang_encoding(const char *str) { BLI_strncpy(global_encoding_name, str, sizeof(global_encoding_name)); /* bind_textdomain_codeset(DOMAIN_NAME, encoding_name); */ @@ -112,7 +112,7 @@ void BLF_lang_init(void) return; } -static void BLF_lang_encoding(const char *str) +void BLF_lang_encoding(const char *str) { (void)str; return; diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index 1d6aa9bd6d7..3564c93681a 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -239,17 +239,17 @@ static int _edge_isBoundary(CCGEdge *e); /***/ -static enum { +enum { Vert_eEffected= (1<<0), Vert_eChanged= (1<<1), Vert_eSeam= (1<<2), -} VertFlags; -static enum { +} /*VertFlags*/; +enum { Edge_eEffected= (1<<0), -} CCGEdgeFlags; -static enum { +} /*CCGEdgeFlags*/; +enum { Face_eEffected= (1<<0), -} FaceFlags; +} /*FaceFlags*/; struct _CCGVert { CCGVert *next; /* EHData.next */ diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index d85950ce22d..bdd81a8ad03 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -161,6 +161,7 @@ static float KDOP_AXES[13][3] = heap[parent] = element; \ } +#if 0 static int ADJUST_MEMORY(void *local_memblock, void **memblock, int new_size, int *max_size, int size_per_item) { int new_max_size = *max_size * 2; @@ -186,7 +187,7 @@ static int ADJUST_MEMORY(void *local_memblock, void **memblock, int new_size, in else return FALSE; } - +#endif ////////////////////////////////////////////////////////////////////////////////////////////////////// // Introsort diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c index 10ee18d5142..560eb55981f 100644 --- a/source/blender/blenlib/intern/bpath.c +++ b/source/blender/blenlib/intern/bpath.c @@ -141,9 +141,11 @@ void BLI_bpathIterator_init(struct BPathIterator **bpi_pt, Main *bmain, const ch BLI_bpathIterator_step(bpi); } +#if 0 static void BLI_bpathIterator_alloc(struct BPathIterator **bpi) { *bpi= MEM_mallocN(sizeof(BPathIterator), "BLI_bpathIterator_alloc"); } +#endif void BLI_bpathIterator_free(struct BPathIterator *bpi) { if (bpi->seqdata.seqar) diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index c0d096ed7e0..12cd7b1eea4 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -79,7 +79,7 @@ static enum { B_FS_DIRNAME, B_FS_FILENAME -} eFile_ButEvents; +} /*eFile_ButEvents*/; static void do_file_buttons(bContext *C, void *UNUSED(arg), int event) diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 4c336c2c313..203e6a618a5 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -150,10 +150,12 @@ static void node_buts_curvevec(uiLayout *layout, bContext *UNUSED(C), PointerRNA } static float *_sample_col= NULL; // bad bad, 2.5 will do better? +#if 0 static void node_curvemap_sample(float *col) { _sample_col= col; } +#endif static void node_buts_curvecol(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 321f68a157f..df431f06ef6 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5306,6 +5306,7 @@ static void draw_box(float vec[8][3]) } /* uses boundbox, function used by Ketsji */ +#if 0 static void get_local_bounds(Object *ob, float *center, float *size) { BoundBox *bb= object_get_boundbox(ob); @@ -5324,8 +5325,7 @@ static void get_local_bounds(Object *ob, float *center, float *size) center[2]= (bb->vec[0][2] + bb->vec[1][2])/2.0; } } - - +#endif static void draw_bb_quadric(BoundBox *bb, short type) { diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index cefe0254ae4..e880e4c3610 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -925,6 +925,7 @@ static void v3d_posearmature_buts(uiLayout *layout, Object *ob) } /* assumes armature editmode */ +#if 0 static void validate_editbonebutton_cb(bContext *C, void *bonev, void *namev) { EditBone *eBone= bonev; @@ -939,6 +940,7 @@ static void validate_editbonebutton_cb(bContext *C, void *bonev, void *namev) ED_armature_bone_rename(CTX_data_edit_object(C)->data, oldname, newname); // editarmature.c WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, CTX_data_edit_object(C)); // XXX fix } +#endif static void v3d_editarmature_buts(uiLayout *layout, Object *ob) { @@ -1199,16 +1201,6 @@ static void do_view3d_region_buttons(bContext *C, void *UNUSED(index), int event WM_event_add_notifier(C, NC_SPACE|ND_SPACE_VIEW3D, ob); } -static void removeTransformOrientation_func(bContext *C, void *target, void *UNUSED(arg)) -{ - BIF_removeTransformOrientation(C, (TransformOrientation *) target); -} - -static void selectTransformOrientation_func(bContext *C, void *target, void *UNUSED(arg)) -{ - BIF_selectTransformOrientation(C, (TransformOrientation *) target); -} - static void view3d_panel_object(const bContext *C, Panel *pa) { uiBlock *block; diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 72ba3269246..92a6b48dd14 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1382,12 +1382,14 @@ static void drawTransformView(const struct bContext *C, struct ARegion *UNUSED(a drawSnapping(C, t); } +#if 0 static void drawTransformPixel(const struct bContext *UNUSED(C), struct ARegion *UNUSED(ar), void *UNUSED(arg)) { // TransInfo *t = arg; // // drawHelpline(C, t->mval[0], t->mval[1], t); } +#endif void saveTransform(bContext *C, TransInfo *t, wmOperator *op) { @@ -5890,9 +5892,9 @@ void BIF_TransformSetUndo(char *UNUSED(str)) } +#if 0 // TRANSFORM_FIX_ME static void NDofTransform(void) { -#if 0 // TRANSFORM_FIX_ME float fval[7]; float maxval = 50.0f; // also serves as threshold int axis = -1; @@ -5937,5 +5939,5 @@ static void NDofTransform(void) initTransform(mode, CTX_NDOF); Transform(); } -#endif } +#endif diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index cf84e02b8ae..ab1cbab9a23 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -83,6 +83,8 @@ //#include "blendef.h" /* for selection modes */ +#define USE_BVH_FACE_PROJECT + /********************* PROTOTYPES ***********************/ void setSnappingCallback(TransInfo *t); @@ -1020,7 +1022,7 @@ void TargetSnapClosest(TransInfo *t) } } /*================================================================*/ - +#ifndef USE_BVH_FACE_SNAP static int snapFace(ARegion *ar, float v1co[3], float v2co[3], float v3co[3], float *v4co, float mval[2], float ray_start[3], float ray_start_local[3], float ray_normal_local[3], float obmat[][4], float timat[][3], float *loc, float *no, int *dist, float *depth) { float lambda; @@ -1071,6 +1073,7 @@ static int snapFace(ARegion *ar, float v1co[3], float v2co[3], float v3co[3], fl return retval; } +#endif static int snapEdge(ARegion *ar, float v1co[3], short v1no[3], float v2co[3], short v2no[3], float mval[2], float ray_start[3], float ray_start_local[3], float ray_normal_local[3], float obmat[][4], float timat[][3], float *loc, float *no, int *dist, float *depth) { @@ -1304,7 +1307,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh { case SCE_SNAP_MODE_FACE: { -#if 1 // Added for durian +#ifdef USE_BVH_FACE_SNAP // Added for durian BVHTreeRayHit hit; BVHTreeFromMesh treeData; |