[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58057] trunk/blender/intern/cycles/ blender/blender_object.cpp: Fix #36037: cycles from dupli generated texture coordinates were wrong, should

[Brecht Van Lommel]

Revision: 58057
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58057
Author:   blendix
Date:     2013-07-07 10:39:56 +0000 (Sun, 07 Jul 2013)
Log Message:
-----------
Fix #36037: cycles from dupli generated texture coordinates were wrong, should
have been normalized to 0..1 range.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_object.cpp

Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp	2013-07-07 05:19:28 UTC (rev 58056)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2013-07-07 10:39:56 UTC (rev 58057)
@@ -304,7 +304,7 @@
 		}
 
 		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 {