add inline functions for max/min ints, good to use when the arguments are function calls (we had a few of these).

2 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/render/intern/raytrace/bvh.h b/source/blender/render/intern/raytrace/bvh.h
index 9318e1758a6..a0d730c5b8a 100644
--- a/source/blender/render/intern/raytrace/bvh.h
+++ b/source/blender/render/intern/raytrace/bvh.h
@@ -88,8 +88,8 @@ static inline int rayobject_bb_intersect_test(const Isect *isec, const float *_b
 
 	RE_RC_COUNT(isec->raycounter->bb.test);
 	
-	if (t1x > t2y || t2x < t1y || t1x > t2z || t2x < t1z || t1y > t2z || t2y < t1z) return 0;
-	if (t2x < 0.0 || t2y < 0.0 || t2z < 0.0) return 0;
+	if (t1x > t2y  || t2x < t1y  || t1x > t2z || t2x < t1z || t1y > t2z || t2y < t1z) return 0;
+	if (t2x < 0.0f || t2y < 0.0f || t2z < 0.0f) return 0;
 	if (t1x > isec->dist || t1y > isec->dist || t1z > isec->dist) return 0;
 	RE_RC_COUNT(isec->raycounter->bb.hit);	
 
diff --git a/source/blender/render/intern/raytrace/rayobject_octree.cpp b/source/blender/render/intern/raytrace/rayobject_octree.cpp
index 538c5493282..5ae716ac942 100644
--- a/source/blender/render/intern/raytrace/rayobject_octree.cpp
+++ b/source/blender/render/intern/raytrace/rayobject_octree.cpp
@@ -649,9 +649,9 @@ static void RE_rayobject_octree_done(RayObject *tree)
 	t02 = oc->max[2] - oc->min[2];
 	
 	/* this minus 0.1 is old safety... seems to be needed? */
-	oc->ocfacx = (oc->ocres - 0.1) / t00;
-	oc->ocfacy = (oc->ocres - 0.1) / t01;
-	oc->ocfacz = (oc->ocres - 0.1) / t02;
+	oc->ocfacx = (oc->ocres - 0.1f) / t00;
+	oc->ocfacy = (oc->ocres - 0.1f) / t01;
+	oc->ocfacz = (oc->ocres - 0.1f) / t02;
 	
 	oc->ocsize = sqrt(t00 * t00 + t01 * t01 + t02 * t02);  /* global, max size octree */