diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-24 16:32:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-24 17:04:11 +0300 |
| commit | 86faf8ac844f8d227a4c4fada7d5eb28a93ee6a7 (patch) | |
| tree | 0ab712910a5087155a865ef6875e112212dc063f /source | |
| parent | 97b2483a7a78253fcbd4dd5d114a1c7a8668c4ef (diff) | |
Depsgraph: Remove shortcut of freeing scene's depsgraph
It will not be possible to do that after depsgraph becomes more context
oriented. Which means, all code will need to explicitly tell which graph
to free,
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 | ||||
| -rw-r--r-- | source/blender/depsgraph/DEG_depsgraph_build.h | 3 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_build.cc | 8 |
3 files changed, 1 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 5477ab97201..7370bd8a47e 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -2457,7 +2457,7 @@ void BKE_scene_ensure_depsgraph_hash(Scene *scene) void BKE_scene_free_depsgraph_hash(Scene *scene) { /* TODO(sergey): Keep this for until we get rid of depsgraph_legacy. */ - DEG_scene_graph_free(scene); + DEG_graph_free(scene->depsgraph_legacy); if (scene->depsgraph_hash == NULL) { return; } diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h index 0e29f24f454..067bd5ba8e9 100644 --- a/source/blender/depsgraph/DEG_depsgraph_build.h +++ b/source/blender/depsgraph/DEG_depsgraph_build.h @@ -77,9 +77,6 @@ void DEG_scene_relations_update(struct Main *bmain, struct Scene *scene); void DEG_scene_relations_rebuild(struct Main *bmain, struct Scene *scene); -/* Delete scene graph. */ -void DEG_scene_graph_free(struct Scene *scene); - /* Add Dependencies ----------------------------- */ /* Handle for components to define their dependencies from callbacks. diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc index 42ccd806dc8..87dcde045a6 100644 --- a/source/blender/depsgraph/intern/depsgraph_build.cc +++ b/source/blender/depsgraph/intern/depsgraph_build.cc @@ -304,14 +304,6 @@ void DEG_scene_relations_rebuild(Main *bmain, Scene *scene) DEG_scene_relations_update(bmain, scene); } -void DEG_scene_graph_free(Scene *scene) -{ - if (scene->depsgraph_legacy) { - DEG_graph_free(scene->depsgraph_legacy); - scene->depsgraph_legacy = NULL; - } -} - void DEG_add_collision_relations(DepsNodeHandle *handle, Scene *scene, Object *ob, |