[Bf-blender-cvs] [e9e703f0dd4] blender2.8: Depsgraph: Remove old depsgraph header from collada

[Sergey Sharybin]

Commit: e9e703f0dd4fb3d0a91cc370f02f99ef36609766
Author: Sergey Sharybin
Date:   Thu Apr 6 16:17:21 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBe9e703f0dd4fb3d0a91cc370f02f99ef36609766

Depsgraph: Remove old depsgraph header from collada

===================================================================

M	source/blender/collada/ArmatureImporter.cpp
M	source/blender/collada/CMakeLists.txt
M	source/blender/collada/DocumentImporter.cpp
M	source/blender/collada/collada_utils.cpp

===================================================================

diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 0ea8324ed7c..9c8b8fc25d6 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -34,7 +34,6 @@
 
 extern "C" {
 #include "BKE_action.h"
-#include "BKE_depsgraph.h"
 #include "BKE_object.h"
 #include "BKE_armature.h"
 #include "BLI_string.h"
@@ -42,6 +41,8 @@ extern "C" {
 #include "ED_armature.h"
 }
 
+#include "DEG_depsgraph.h"
+
 #include "collada_utils.h"
 #include "ArmatureImporter.h"
 
@@ -496,7 +497,7 @@ void ArmatureImporter::create_armature_bones(std::vector<Object *> &ob_arms)
 			ob_arms.push_back(ob_arm);
 		}
 
-		DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA);
+		DEG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA);
 	}
 }
 
@@ -629,7 +630,7 @@ Object *ArmatureImporter::create_armature_bones(SkinInfo& skin)
 	ED_armature_from_edit(armature);
 	ED_armature_edit_free(armature);
 
-	DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA);
+	DEG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA);
 
 	return ob_arm;
 }
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index 293049a1a05..8642bbee698 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -30,6 +30,7 @@ set(INC
 	../blenkernel
 	../blenlib
 	../blentranslation
+	../depsgraph
 	../editors/include
 	../makesdna
 	../makesrna
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 5118234a587..7cb6045b73e 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -63,7 +63,6 @@ extern "C" {
 #include "BKE_library.h"
 #include "BKE_texture.h"
 #include "BKE_fcurve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_scene.h"
 #include "BKE_global.h"
 #include "BKE_material.h"
@@ -83,6 +82,9 @@ extern "C" {
 
 }
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ExtraHandler.h"
 #include "ErrorHandler.h"
 #include "DocumentImporter.h"
@@ -231,7 +233,7 @@ void DocumentImporter::finish()
 		}
 
 		// update scene
-		DAG_relations_tag_update(bmain);
+		DEG_relations_tag_update(bmain);
 		WM_event_add_notifier(mContext, NC_OBJECT | ND_TRANSFORM, NULL);
 
 	}
@@ -242,7 +244,7 @@ void DocumentImporter::finish()
 	armature_importer.set_tags_map(this->uid_tags_map);
 	armature_importer.make_armatures(mContext, *objects_to_scale);
 	armature_importer.make_shape_keys();
-	DAG_relations_tag_update(bmain);
+	DEG_relations_tag_update(bmain);
 
 #if 0
 	armature_importer.fix_animation();
@@ -276,7 +278,7 @@ void DocumentImporter::finish()
 		}
 		libnode_ob.clear();
 
-		DAG_relations_tag_update(bmain);
+		DEG_relations_tag_update(bmain);
 	}
 	
 	bc_match_scale(objects_to_scale, unit_converter, !this->import_settings->import_units);
@@ -418,7 +420,7 @@ Object *DocumentImporter::create_instance_node(Object *source_ob, COLLADAFW::Nod
 	fprintf(stderr, "create <instance_node> under node id=%s from node id=%s\n", instance_node ? instance_node->getOriginalId().c_str() : NULL, source_node ? source_node->getOriginalId().c_str() : NULL);
 
 	Object *obn = BKE_object_copy(G.main, source_ob);
-	DAG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+	DEG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 	BKE_collection_object_add_from(sce, source_ob, obn);
 
 	if (instance_node) {
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index ac4395e1430..1ba8658f245 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -45,7 +45,6 @@ extern "C" {
 
 #include "BKE_context.h"
 #include "BKE_customdata.h"
-#include "BKE_depsgraph.h"
 #include "BKE_object.h"
 #include "BKE_global.h"
 #include "BKE_mesh.h"
@@ -61,6 +60,8 @@ extern "C" {
 #include "bmesh_tools.h"
 }
 
+#include "DEG_depsgraph.h"
+
 #include "collada_utils.h"
 #include "ExportSettings.h"
 
@@ -118,8 +119,8 @@ int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space)
 	BKE_object_workob_calc_parent(sce, ob, &workob);
 	invert_m4_m4(ob->parentinv, workob.obmat);
 
-	DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
-	DAG_id_tag_update(&par->id, OB_RECALC_OB);
+	DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+	DEG_id_tag_update(&par->id, OB_RECALC_OB);
 
 	/** done once after import */
 #if 0
@@ -136,7 +137,7 @@ Object *bc_add_object(Scene *scene, int type, const char *name)
 
 	ob->data = BKE_object_obdata_add_from_type(G.main, type, name);
 	ob->lay = scene->lay;
-	DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+	DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
 	BKE_scene_base_select(scene, BKE_scene_base_add(scene, ob));