[Bf-blender-cvs] [abbf287f48c] cycles_refactor: Fix mistake in dupli_uv in kernel object refactoring.

Brecht Van Lommel noreply at git.blender.org
Mon Feb 5 22:14:10 CET 2018


Commit: abbf287f48cdd910590527fd9bf2e176a3773893
Author: Brecht Van Lommel
Date:   Mon Feb 5 21:53:56 2018 +0100
Branches: cycles_refactor
https://developer.blender.org/rBabbf287f48cdd910590527fd9bf2e176a3773893

Fix mistake in dupli_uv in kernel object refactoring.

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

M	intern/cycles/kernel/geom/geom_object.h

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

diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h
index cdbed52cdf6..35b9a4456a5 100644
--- a/intern/cycles/kernel/geom/geom_object.h
+++ b/intern/cycles/kernel/geom/geom_object.h
@@ -283,7 +283,7 @@ ccl_device_inline float3 object_dupli_uv(KernelGlobals *kg, int object)
 	if(object == OBJECT_NONE)
 		return make_float3(0.0f, 0.0f, 0.0f);
 
-	return make_float3(kernel_tex_fetch(__objects, object).ob_dupli_uv[0], kernel_tex_fetch(__objects, object).ob_dupli_uv[0], 0.0f);
+	return make_float3(kernel_tex_fetch(__objects, object).ob_dupli_uv[0], kernel_tex_fetch(__objects, object).ob_dupli_uv[1], 0.0f);
 }
 
 /* Information about mesh for motion blurred triangles and curves */



More information about the Bf-blender-cvs mailing list