diff options
author | Martin Poirier <theeth@yahoo.com> | 2005-06-30 08:11:41 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2005-06-30 08:11:41 +0400 |
commit | 99a8747e8246f8eabc8c60a850f2e2651995f8a1 (patch) | |
tree | 0a7f7a99d7230b3f2bed2b8dd23a4b468c8fdfe5 /source/blender | |
parent | a344dca9cfb1262f375483cb89c716019f44a782 (diff) |
Warning hunt:
INIT_MINMAX and INIT_MINMAX2 are always used on floats but use doubles for initializing, giving countless warnings.
Added the nice 'f' to tell compilers that we want floats.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_utildefines.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index b1f084fd566..eeeb7a2019b 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -73,9 +73,9 @@ #define MAX3(x,y,z) MAX2( MAX2((x),(y)) , (z) ) #define MAX4(x,y,z,a) MAX2( MAX2((x),(y)) , MAX2((z),(a)) ) -#define INIT_MINMAX(min, max) (min)[0]= (min)[1]= (min)[2]= 1.0e30; (max)[0]= (max)[1]= (max)[2]= -1.0e30; +#define INIT_MINMAX(min, max) (min)[0]= (min)[1]= (min)[2]= 1.0e30f; (max)[0]= (max)[1]= (max)[2]= -1.0e30f; -#define INIT_MINMAX2(min, max) (min)[0]= (min)[1]= 1.0e30; (max)[0]= (max)[1]= -1.0e30; +#define INIT_MINMAX2(min, max) (min)[0]= (min)[1]= 1.0e30f; (max)[0]= (max)[1]= -1.0e30f; #define DO_MINMAX(vec, min, max) if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \ if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \ |