From d675415eef9f565b1828f48dfe874321af1c4af8 Mon Sep 17 00:00:00 2001 From: Luca Rood Date: Thu, 8 Jun 2017 10:14:53 +0200 Subject: Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c --- .../editors/space_outliner/outliner_collections.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/space_outliner/outliner_collections.c') diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 97b03693ca6..315a3af1898 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -26,10 +26,12 @@ #include "BKE_context.h" #include "BKE_collection.h" -#include "BKE_depsgraph.h" #include "BKE_layer.h" #include "BKE_report.h" +#include "DEG_depsgraph.h" +#include "DEG_depsgraph_build.h" + #include "BLI_listbase.h" #include "ED_screen.h" @@ -121,10 +123,10 @@ static int collection_link_exec(bContext *C, wmOperator *op) BKE_collection_link(sl, sc); - DAG_relations_tag_update(CTX_data_main(C)); + DEG_relations_tag_update(CTX_data_main(C)); /* TODO(sergey): Use proper flag for tagging here. */ - DAG_id_tag_update(&scene->id, 0); + DEG_id_tag_update(&scene->id, 0); WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL); return OPERATOR_FINISHED; @@ -223,10 +225,10 @@ static int collection_unlink_exec(bContext *C, wmOperator *op) SceneLayer *sl = CTX_data_scene_layer(C); BKE_collection_unlink(sl, lc); - DAG_relations_tag_update(CTX_data_main(C)); + DEG_relations_tag_update(CTX_data_main(C)); /* TODO(sergey): Use proper flag for tagging here. */ - DAG_id_tag_update(&CTX_data_scene(C)->id, 0); + DEG_id_tag_update(&CTX_data_scene(C)->id, 0); WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL); return OPERATOR_FINISHED; @@ -255,7 +257,7 @@ static int collection_new_exec(bContext *C, wmOperator *UNUSED(op)) SceneCollection *sc = BKE_collection_add(scene, NULL, NULL); BKE_collection_link(sl, sc); - DAG_relations_tag_update(CTX_data_main(C)); + DEG_relations_tag_update(CTX_data_main(C)); WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL); return OPERATOR_FINISHED; } @@ -346,10 +348,10 @@ static int collection_delete_exec(bContext *C, wmOperator *UNUSED(op)) TODO_LAYER_OVERRIDE; /* handle overrides */ outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, collection_delete_cb, &data); - DAG_relations_tag_update(CTX_data_main(C)); + DEG_relations_tag_update(CTX_data_main(C)); /* TODO(sergey): Use proper flag for tagging here. */ - DAG_id_tag_update(&scene->id, 0); + DEG_id_tag_update(&scene->id, 0); WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL); -- cgit v1.2.3