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
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-07-07 14:39:56 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-07-07 14:39:56 +0400
commite75064bd34d722caf5482f836f0404a17fbde64a (patch)
treec5a5eea2fa8b6705616576dc13df52f2f8437533 /intern
parent862f695d1c64e5ffbdc1dafb7aa3fa5daed1136c (diff)
Fix #36037: cycles from dupli generated texture coordinates were wrong, should
have been normalized to 0..1 range.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_object.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 4a72341cd8c..d1e3d64d572 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -304,7 +304,7 @@ Object *BlenderSync::sync_object(BL::Object b_parent, int persistent_id[OBJECT_P
}
if (b_dupli_ob) {
- object->dupli_generated = get_float3(b_dupli_ob.orco());
+ object->dupli_generated = 0.5f*get_float3(b_dupli_ob.orco()) - make_float3(0.5f, 0.5f, 0.5f);
object->dupli_uv = get_float2(b_dupli_ob.uv());
}
else {