diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-07-09 19:24:31 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-07-09 19:26:54 +0400 |
| commit | 5b0e4cd8c99e500baee0d951f4819b68c9215cd9 (patch) | |
| tree | 21a5676234682ff12f4eb620a28aa2024f381f39 /intern | |
| parent | f14e740dee3cdc23c23b37b9f6ba8a14a0bed811 (diff) | |
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 ...
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 2897ef1a0b6..94dec0b8244 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 */ |