diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-08 17:25:43 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-08 23:36:01 +0300 |
| commit | 670e6cab4319b94c96c6a61cb76199f1054b935a (patch) | |
| tree | e305aede36e42c6d1b690bf6c610243ec4f9ddb6 | |
| parent | 3ceb3512f850028fe6843fdad37cb6271514b9b8 (diff) | |
Revert "Depsgraph: Fix crash with copy on write when scene has legacy bases"
This reverts commit 00ddbd5848da7e746e23695cff00a739eaf75cf2.
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index c9a82a2f7e9..7bbab62e35b 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -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) |