kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Another fix for T40230/T40290: Object tags were not properly initialized

Browse Source 
before entering the recursion check.

Now use group tags instead of object tags, which could be a little more
efficient and was used before this patch too.
This commit is contained in:
Lukas Tönne 2014-05-23 09:26:29 +02:00
parent 01f5845778
commit 90449f9950
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/object/object_group.c
View File

@ -76,27 +76,28 @@ static bool group_link_early_exit_check(Group *group, Object *object)
static bool check_object_instances_group_recursive(Object *object, Group *group)
{
if ((object->id.flag & LIB_DOIT) == 0) {
if (object->dup_group) {
Group *dup_group = object->dup_group;
if ((dup_group->id.flag & LIB_DOIT) == 0) {
/* Cycle already exists in groups, let's prevent further crappyness */
return true;
}
/* flag the object to identify cyclic dependencies in further dupli groups */
object->id.flag &= ~LIB_DOIT;
dup_group->id.flag &= ~LIB_DOIT;
if (object->dup_group) {
if (object->dup_group == group)
if (dup_group == group)
return true;
else {
GroupObject *gob;
for (gob = object->dup_group->gobject.first; gob; gob = gob->next) {
for (gob = dup_group->gobject.first; gob; gob = gob->next) {
if (check_object_instances_group_recursive(gob->ob, group))
return true;
}
}
}
/* un-flag the object, it's allowed to have the same group multiple times in parallel */
object->id.flag |= LIB_DOIT;
dup_group->id.flag |= LIB_DOIT;
}
return false;
}