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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-12 15:34:16 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-12 15:34:16 +0400
commit88b25b871d965718e693a2766a19d75efa0f0dfc (patch)
treefecf9a73fdbb2030b85b8e4947683949f37578fe /intern/cycles/util/util_transform.h
parent42e2c47b3d744c5d53ccd315ffda3c26c7d60bff (diff)
Cycles: fix mapping node rotation not working correct for Y/Z axes, patch by Sanne.
Diffstat (limited to 'intern/cycles/util/util_transform.h')
-rw-r--r--intern/cycles/util/util_transform.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h
index 9cde410edc8..e2b022dc478 100644
--- a/intern/cycles/util/util_transform.h
+++ b/intern/cycles/util/util_transform.h
@@ -173,8 +173,8 @@ __device_inline Transform transform_euler(float3 euler)
{
return
transform_rotate(euler.x, make_float3(1.0f, 0.0f, 0.0f)) *
- transform_rotate(euler.y, make_float3(1.0f, 0.0f, 0.0f)) *
- transform_rotate(euler.z, make_float3(1.0f, 0.0f, 0.0f));
+ transform_rotate(euler.y, make_float3(0.0f, 1.0f, 0.0f)) *
+ transform_rotate(euler.z, make_float3(0.0f, 0.0f, 1.0f));
}
__device_inline Transform transform_orthographic(float znear, float zfar)