diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-10 18:50:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-10 18:50:34 +0400 |
| commit | 5ddc5fbfb365a79b5ffa8ab7fbec7c4a89321e06 (patch) | |
| tree | f998ddb2e1f38b14b148358221827f4d0af3bfb6 | |
| parent | 5ebe7d6a139c1062c4bf9de87b20eac8eff9ff59 (diff) | |
Fix #33135: cycles object info random number not working anymore.
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 7 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 67255d9f707..e8fa5c0ff3d 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -267,10 +267,15 @@ Object *BlenderSync::sync_object(BL::Object b_parent, int persistent_id[OBJECT_P object->motion.post = tfm; object->use_motion = false; + /* random number */ object->random_id = hash_string(object->name.c_str()); - if(persistent_id) + + if(persistent_id) { for(int i = 0; i < OBJECT_PERSISTENT_ID_SIZE; i++) object->random_id = hash_int_2d(object->random_id, persistent_id[i]); + } + else + object->random_id = hash_int_2d(object->random_id, 0); /* visibility flags for both parent */ object->visibility = object_ray_visibility(b_ob) & PATH_RAY_ALL; diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 3c426ade54b..de55eaba775 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -422,7 +422,7 @@ class USERPREF_PT_system(Panel): col.separator() col.separator() - if hasattr(system, "compute_device"): + if hasattr(system, "compute_device_type"): col.label(text="Compute Device:") col.row().prop(system, "compute_device_type", expand=True) sub = col.row() |