[Bf-blender-cvs] [09a746b] master: Cycles: Cleanup, typos

[Sergey Sharybin]

Commit: 09a746b857452705a152b3e9acadc39d884de8c3
Author: Sergey Sharybin
Date:   Wed Apr 8 01:13:16 2015 +0500
Branches: master
https://developer.blender.org/rB09a746b857452705a152b3e9acadc39d884de8c3

Cycles: Cleanup, typos

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

M	intern/cycles/kernel/geom/geom_triangle_intersect.h
M	intern/cycles/render/graph.cpp

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

diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index d867a19..a0e3605 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -77,10 +77,10 @@ void triangle_intersect_precalc(float3 dir,
 	}
 
 	/* Calculate the shear constants. */
-	float inf_dir_z = 1.0f / IDX(dir, kz);
-	isect_precalc->Sx = IDX(dir, kx) * inf_dir_z;
-	isect_precalc->Sy = IDX(dir, ky) * inf_dir_z;
-	isect_precalc->Sz = inf_dir_z;
+	float inv_dir_z = 1.0f / IDX(dir, kz);
+	isect_precalc->Sx = IDX(dir, kx) * inv_dir_z;
+	isect_precalc->Sy = IDX(dir, ky) * inv_dir_z;
+	isect_precalc->Sz = inv_dir_z;
 
 	/* Store the dimensions. */
 	isect_precalc->kx = kx;
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 4767bbb..b63a7c1 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -892,7 +892,7 @@ void ShaderGraph::dump_graph(const char *filename)
 				        input,
 				        output->name, input->name);
 				fprintf(fd,
-				        "\"\%p\":\"OUT_%p\":e -> \"%p\":\"IN_%p\":w [label=\"\"]\n",
+				        "\"%p\":\"OUT_%p\":e -> \"%p\":\"IN_%p\":w [label=\"\"]\n",
 				        output->parent,
 				        output,
 				        input->parent,