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 /source/blender/editors/transform | |
| parent | cf6f6c1c5e3971e0d4e023bd8267b9430e46f598 (diff) | |
clear some unused warnings
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 7 |
2 files changed, 9 insertions, 4 deletions
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; |