blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 756 Projects 19 Wiki Activity

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

This reverts commit 00ddbd5848.
This commit is contained in:
Dalai Felinto 2017-11-08 12:25:43 -02:00
parent 3ceb3512f8
commit 670e6cab43
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,17 +111,7 @@ 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;
BLI_listbase_clear(&scene_cow->base);
break;
}
#endif
SPECIAL_CASE(ID_TE, Tex, nodetree)
SPECIAL_CASE(ID_WO, World, nodetree)
@ -153,17 +143,7 @@ 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;
BLI_listbase_clear(&storage->scene.base);
return &storage->scene.id;
}
#endif
SPECIAL_CASE(ID_TE, Tex, nodetree, tex)
SPECIAL_CASE(ID_WO, World, nodetree, world)