[Bf-blender-cvs] [eb5cd57] master: Cleanup: Output argument name and const qualifier

Sergey Sharybin noreply at git.blender.org
Tue Aug 23 15:56:34 CEST 2016


Commit: eb5cd578b8cb9839b4b1fb8b6e9f56bbaad7bfae
Author: Sergey Sharybin
Date:   Tue Aug 23 15:56:10 2016 +0200
Branches: master
https://developer.blender.org/rBeb5cd578b8cb9839b4b1fb8b6e9f56bbaad7bfae

Cleanup: Output argument name and const qualifier

===================================================================

M	source/blender/render/intern/raytrace/rayobject.cpp

===================================================================

diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp
index 3415e52..c16ef55 100644
--- a/source/blender/render/intern/raytrace/rayobject.cpp
+++ b/source/blender/render/intern/raytrace/rayobject.cpp
@@ -200,16 +200,19 @@ static bool isect_ray_tri_watertight_no_sign_check_v3(
 	}
 }
 
-MALWAYS_INLINE int isec_tri_quad(float start[3], const struct IsectRayPrecalc *isect_precalc, RayFace *face, float r_uv[2], float *lambda)
+MALWAYS_INLINE int isec_tri_quad(const float start[3],
+                                 const struct IsectRayPrecalc *isect_precalc,
+                                 const RayFace *face,
+                                 float r_uv[2], float *r_lambda)
 {
 	float uv[2], l;
 
 	if (isect_ray_tri_watertight_v3(start, isect_precalc, face->v1, face->v2, face->v3, &l, uv)) {
 		/* check if intersection is within ray length */
-		if (l > -RE_RAYTRACE_EPSILON && l < *lambda) {
+		if (l > -RE_RAYTRACE_EPSILON && l < *r_lambda) {
 			r_uv[0] = -uv[0];
 			r_uv[1] = -uv[1];
-			*lambda = l;
+			*r_lambda = l;
 			return 1;
 		}
 	}
@@ -218,10 +221,10 @@ MALWAYS_INLINE int isec_tri_quad(float start[3], const struct IsectRayPrecalc *i
 	if (RE_rayface_isQuad(face)) {
 		if (isect_ray_tri_watertight_v3(start, isect_precalc, face->v1, face->v3, face->v4, &l, uv)) {
 			/* check if intersection is within ray length */
-			if (l > -RE_RAYTRACE_EPSILON && l < *lambda) {
+			if (l > -RE_RAYTRACE_EPSILON && l < *r_lambda) {
 				r_uv[0] = -uv[0];
 				r_uv[1] = -uv[1];
-				*lambda = l;
+				*r_lambda = l;
 				return 2;
 			}
 		}
@@ -232,13 +235,14 @@ MALWAYS_INLINE int isec_tri_quad(float start[3], const struct IsectRayPrecalc *i
 
 /* Simpler yes/no Ray Triangle/Quad Intersection */
 
-MALWAYS_INLINE int isec_tri_quad_neighbour(float start[3], float dir[3], RayFace *face)
+MALWAYS_INLINE int isec_tri_quad_neighbour(const float start[3],
+                                           const float dir[3],
+                                           const RayFace *face)
 {
 	float r[3];
 	struct IsectRayPrecalc isect_precalc;
 	float uv[2], l;
 
-
 	negate_v3_v3(r, dir); /* note, different than above function */
 
 	isect_ray_tri_watertight_v3_precalc(&isect_precalc, r);




More information about the Bf-blender-cvs mailing list