diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-21 09:07:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-21 09:07:26 +0400 |
| commit | b2c66e268f68ee406e5e05a65d9d1609b65d20c4 (patch) | |
| tree | 722192b9fe1d7af57695860fc3639781bedf5f2b /source/blender/render/intern/raytrace | |
| parent | e09ddf0d4ba6f6d1e8963d41eef153dadce482f8 (diff) | |
replace MIN/MAX 3,4 with inline functions
Diffstat (limited to 'source/blender/render/intern/raytrace')
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject_octree.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_octree.cpp b/source/blender/render/intern/raytrace/rayobject_octree.cpp index dad7fe5fd60..148e3417ea9 100644 --- a/source/blender/render/intern/raytrace/rayobject_octree.cpp +++ b/source/blender/render/intern/raytrace/rayobject_octree.cpp @@ -542,13 +542,13 @@ static void octree_fill_rayface(Octree *oc, RayFace *face) oc2 = rts[1][c]; oc3 = rts[2][c]; if (!RE_rayface_isQuad(face)) { - ocmin[c] = MIN3(oc1, oc2, oc3); - ocmax[c] = MAX3(oc1, oc2, oc3); + ocmin[c] = min_iii(oc1, oc2, oc3); + ocmax[c] = max_iii(oc1, oc2, oc3); } else { oc4 = rts[3][c]; - ocmin[c] = MIN4(oc1, oc2, oc3, oc4); - ocmax[c] = MAX4(oc1, oc2, oc3, oc4); + ocmin[c] = min_iiii(oc1, oc2, oc3, oc4); + ocmax[c] = max_iiii(oc1, oc2, oc3, oc4); } if (ocmax[c] > oc->ocres - 1) ocmax[c] = oc->ocres - 1; if (ocmin[c] < 0) ocmin[c] = 0; @@ -993,7 +993,7 @@ static int RE_rayobject_octree_intersect(RayObject *tree, Isect *is) } xo = ocx1; yo = ocy1; zo = ocz1; - dda_lambda = MIN3(lambda_x, lambda_y, lambda_z); + dda_lambda = min_fff(lambda_x, lambda_y, lambda_z); vec2[0] = ox1; vec2[1] = oy1; @@ -1083,7 +1083,7 @@ static int RE_rayobject_octree_intersect(RayObject *tree, Isect *is) } - dda_lambda = MIN3(lambda_x, lambda_y, lambda_z); + dda_lambda = min_fff(lambda_x, lambda_y, lambda_z); if (dda_lambda == lambda_o) break; /* to make sure the last node is always checked */ if (lambda_o >= 1.0f) break; |