[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52075] trunk/blender: Fix #33135: cycles object info random number not working anymore.

[Brecht Van Lommel]

Revision: 52075
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52075
Author:   blendix
Date:     2012-11-10 14:50:34 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
Fix #33135: cycles object info random number not working anymore.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_object.cpp
    trunk/blender/release/scripts/startup/bl_ui/space_userpref.py

Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp	2012-11-10 13:59:45 UTC (rev 52074)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2012-11-10 14:50:34 UTC (rev 52075)
@@ -267,10 +267,15 @@
 		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;

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2012-11-10 13:59:45 UTC (rev 52074)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2012-11-10 14:50:34 UTC (rev 52075)
@@ -422,7 +422,7 @@
         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()