[Bf-blender-cvs] [5b0e4cd] master: Fix T41003: Object Info's Random socket produces erratic results when material is applied to multiple Dupli instances of an object.

[Lukas Tönne]

Commit: 5b0e4cd8c99e500baee0d951f4819b68c9215cd9
Author: Lukas Tönne
Date:   Wed Jul 9 17:24:31 2014 +0200
https://developer.blender.org/rB5b0e4cd8c99e500baee0d951f4819b68c9215cd9

Fix T41003: Object Info's Random socket produces erratic results when
material is applied to multiple Dupli instances of an object.

One of the random_id initialization lines for cycles objects slipped
into the basic update part in this commit:
rBb98ff5cb5b2c14c33b16e3b129e1e08810e90a6c

This would constantly re-shuffle the random_id ...

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

M	intern/cycles/blender/blender_object.cpp

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

diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 2897ef1..94dec0b 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -289,7 +289,6 @@ Object *BlenderSync::sync_object(BL::Object b_parent, int persistent_id[OBJECT_P
 	uint visibility = object_ray_visibility(b_ob) & PATH_RAY_ALL_VISIBILITY;
 	if(b_parent.ptr.data != b_ob.ptr.data) {
 		visibility &= object_ray_visibility(b_parent);
-		object->random_id ^= hash_int(hash_string(b_parent.name().c_str()));
 	}
 
 	/* make holdout objects on excluded layer invisible for non-camera rays */