Fix T48913: cycles viewport render stuck in loop due to non-unique dupli ID.

2016-08-14 15:33:21 +02:00
parent 11e9c5e10a
commit c0161a1bab
3 changed files with 14 additions and 6 deletions
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -698,7 +698,7 @@ protected:

 /* Object Key */

-enum { OBJECT_PERSISTENT_ID_SIZE = 8 };
+enum { OBJECT_PERSISTENT_ID_SIZE = 16 };

 struct ObjectKey {
 	void *parent;