archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Fix crash with copy on write when scene has legacy bases

Browse Source 
The remapping code was creating plkaceholders for objects coming from legacy
bases, but since those objects were never created by dependency graph (since
they are supposed to be ignored) the copy on write relations creation was
confused.

Now we do some special trickery to clear legacy bases on copy on write.
This commit is contained in:
Sergey Sharybin
2017-07-20 13:25:52 +02:00
parent f42bb9d278
commit 00ddbd5848
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
View File

@@ -110,7 +110,18 @@ void nested_id_hack_discard_pointers(ID *id_cow)
SPECIAL_CASE(ID_LS, FreestyleLineStyle, nodetree)
SPECIAL_CASE(ID_LA, Lamp, nodetree)
SPECIAL_CASE(ID_MA, Material, nodetree)
#if 0
SPECIAL_CASE(ID_SCE, Scene, nodetree)
#else
case ID_SCE:
{
Scene *scene_cow = (Scene *)id_cow;
scene_cow->nodetree = NULL;
scene_cow->base.first = NULL;
scene_cow->base.last = NULL;
break;
}
#endif
SPECIAL_CASE(ID_TE, Tex, nodetree)
SPECIAL_CASE(ID_WO, World, nodetree)
@@ -142,7 +153,18 @@ const ID *nested_id_hack_get_discarded_pointers(NestedIDHackTempStorage *storage
SPECIAL_CASE(ID_LS, FreestyleLineStyle, nodetree, linestyle)
SPECIAL_CASE(ID_LA, Lamp, nodetree, lamp)
SPECIAL_CASE(ID_MA, Material, nodetree, material)
#if 0
SPECIAL_CASE(ID_SCE, Scene, nodetree, scene)
#else
case ID_SCE:
{
storage->scene = *(Scene *)id;
storage->scene.nodetree = NULL;
storage->scene.base.first = NULL;
storage->scene.base.last = NULL;
return &storage->scene.id;
}
#endif
SPECIAL_CASE(ID_TE, Tex, nodetree, tex)
SPECIAL_CASE(ID_WO, World, nodetree, world)