diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-06-08 09:24:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-08 09:24:55 +0400 |
| commit | c423e3ed8f2b92eddd37709648e185bce67f32c7 (patch) | |
| tree | 7ccbb6dae4e3dedf86c8651c3d97c95e37409ffc | |
| parent | d25c46642f674c48dd7476f395931903ec8858d0 (diff) | |
code cleanup: warn undefined compiler defines.
| -rw-r--r-- | source/blender/modifiers/intern/MOD_laplaciansmooth.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/shadbuf.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 29da4076acd..cf9ab8d5ec2 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -52,8 +52,10 @@ #include "ONL_opennl.h" +#if 0 #define MOD_LAPLACIANSMOOTH_MAX_EDGE_PERCENTAGE 1.8f #define MOD_LAPLACIANSMOOTH_MIN_EDGE_PERCENTAGE 0.02f +#endif struct BLaplacianSystem { float *eweights; /* Length weights per Edge */ diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index d8f2d227778..7c9a88622ed 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -272,8 +272,10 @@ static void dm_get_bounds(DerivedMesh *dm, float *sx, float *sy, float *ox, floa #ifdef WITH_OCEANSIM - +#ifdef _OPENMP #define OMP_MIN_RES 18 +#endif + static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd) { DerivedMesh *result; diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 7cb37ce5aa6..6453c03c596 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -60,12 +60,12 @@ /* XXX, could be better implemented... this is for endian issues */ #ifdef __BIG_ENDIAN__ -# define RCOMP 3 +//# define RCOMP 3 # define GCOMP 2 # define BCOMP 1 # define ACOMP 0 #else -# define RCOMP 0 +//# define RCOMP 0 # define GCOMP 1 # define BCOMP 2 # define ACOMP 3 |