diff options
Diffstat (limited to 'source/blender/blenlib/BLI_utildefines.h')
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 3a533f73d9d..18c2aa3313c 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -79,36 +79,36 @@ #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.0e30f; \ - (max)[0]= (max)[1]= (max)[2]= -1.0e30f; \ + (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.0e30f; \ - (max)[0]= (max)[1]= -1.0e30f; \ + (min)[0] = (min)[1] = 1.0e30f; \ + (max)[0] = (max)[1] = -1.0e30f; \ } (void)0 #define DO_MIN(vec, min) { \ - if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \ - if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \ - if( (min)[2]>(vec)[2] ) (min)[2]= (vec)[2]; \ + if ((min)[0] > (vec)[0]) (min)[0] = (vec)[0]; \ + if ((min)[1] > (vec)[1]) (min)[1] = (vec)[1]; \ + if ((min)[2] > (vec)[2]) (min)[2] = (vec)[2]; \ } (void)0 #define DO_MAX(vec, max) { \ - if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \ - if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; \ - if( (max)[2]<(vec)[2] ) (max)[2]= (vec)[2]; \ + if ((max)[0] < (vec)[0]) (max)[0] = (vec)[0]; \ + if ((max)[1] < (vec)[1]) (max)[1] = (vec)[1]; \ + if ((max)[2] < (vec)[2]) (max)[2] = (vec)[2]; \ } (void)0 #define DO_MINMAX(vec, min, max) { \ - if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \ - if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \ - if( (min)[2]>(vec)[2] ) (min)[2]= (vec)[2]; \ - if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \ - if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; \ - if( (max)[2]<(vec)[2] ) (max)[2]= (vec)[2]; \ + if ((min)[0] > (vec)[0] ) (min)[0] = (vec)[0]; \ + if ((min)[1] > (vec)[1] ) (min)[1] = (vec)[1]; \ + if ((min)[2] > (vec)[2] ) (min)[2] = (vec)[2]; \ + if ((max)[0] < (vec)[0] ) (max)[0] = (vec)[0]; \ + if ((max)[1] < (vec)[1] ) (max)[1] = (vec)[1]; \ + if ((max)[2] < (vec)[2] ) (max)[2] = (vec)[2]; \ } (void)0 #define DO_MINMAX2(vec, min, max) { \ - if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \ - if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \ - if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \ - if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; \ + if ((min)[0] > (vec)[0] ) (min)[0] = (vec)[0]; \ + if ((min)[1] > (vec)[1] ) (min)[1] = (vec)[1]; \ + if ((max)[0] < (vec)[0] ) (max)[0] = (vec)[0]; \ + if ((max)[1] < (vec)[1] ) (max)[1] = (vec)[1]; \ } (void)0 /* some math and copy defines */ |