Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-01-02 15:21:24 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-01-02 15:21:24 +0300
commit2a8a56929b095fcff2cca6e87099d98141e1b420 (patch)
tree6f7fd83f22b67572bd45a7dc5648cb452930f4ab
parent4f2583ee1300157a2f08532509ab3a53ef3a7b47 (diff)
Cycles: Fix unneeded int/float conversion happened in previous commit
-rw-r--r--intern/cycles/kernel/geom/geom_triangle_intersect.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index cbb9d27aaf4..475ee50f876 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -67,7 +67,7 @@ void triangle_intersect_precalc(float3 dir,
/* Swap kx and ky dimensions to preserve winding direction of triangles. */
if(IDX(dir, kz) < 0.0f) {
- float tmp = kx;
+ int tmp = kx;
kx = ky;
kx = tmp;
}