diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-29 14:34:16 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-29 14:34:16 +0400 |
| commit | 9e2f377273d60ec8de09f2c5c6f140908bc5f9a6 (patch) | |
| tree | c329b92cd6b49b93bce0ff298c7965b3d7ec68b8 /intern/cycles/blender | |
| parent | e530b50d172f1ad78b303059de483d1e31952578 (diff) | |
Fix #31556: cycles object info random value was not properly randomized for
dupligroups.
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 14d4c2f3ddf..b04e0137e37 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -29,6 +29,7 @@ #include "blender_util.h" #include "util_foreach.h" +#include "util_hash.h" CCL_NAMESPACE_BEGIN @@ -245,17 +246,20 @@ void BlenderSync::sync_object(BL::Object b_parent, int b_index, BL::Object b_ob, /* object sync */ if(object_updated || (object->mesh && object->mesh->need_update)) { object->name = b_ob.name().c_str(); - object->instance_id = b_index; object->pass_id = b_ob.pass_index(); object->tfm = tfm; object->motion.pre = tfm; object->motion.post = tfm; object->use_motion = false; + object->random_id = hash_int_2d(hash_string(object->name.c_str()), b_index); + /* visibility flags for both parent */ object->visibility = object_ray_visibility(b_ob) & PATH_RAY_ALL; - if(b_parent.ptr.data != b_ob.ptr.data) + if(b_parent.ptr.data != b_ob.ptr.data) { object->visibility &= object_ray_visibility(b_parent); + object->random_id ^= hash_int(hash_string(b_parent.name().c_str())); + } /* camera flag is not actually used, instead is tested against render layer flags */ |