Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-08-14 16:33:21 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-08-18 00:16:37 +0300
commitc0161a1bab71331f518bd5c8c1b091df7ee12074 (patch)
tree977e1cff2409d565e35575793eadd1e88a558a60 /intern
parent11e9c5e10a9914413af704d714bd1a5991112fa2 (diff)
Fix T48913: cycles viewport render stuck in loop due to non-unique dupli ID.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_util.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h
index d5dbaba094b..e79f2bbb27d 100644
--- 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;