Depsgraph: add some missing depsgraph tags when relations change.

3 files changed, 5 insertions, 17 deletions

diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index c6ba3b8f4ac..a382b7cca9c 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -232,11 +232,6 @@ void DocumentImporter::finish()
 			objects_to_scale->insert(objects_to_scale->end(), objects_done->begin(), objects_done->end());
 			delete objects_done;
 		}
-
-		// update scene
-		DEG_relations_tag_update(bmain);
-		WM_event_add_notifier(mContext, NC_OBJECT | ND_TRANSFORM, NULL);
-
 	}
 
 
@@ -245,7 +240,6 @@ 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(mContext);
-	DEG_relations_tag_update(bmain);
 
 #if 0
 	armature_importer.fix_animation();
@@ -269,13 +263,16 @@ void DocumentImporter::finish()
 			BKE_scene_collections_object_remove(bmain, sce, ob, true);
 		}
 		libnode_ob.clear();
-
-		DEG_relations_tag_update(bmain);
 	}
 
 	bc_match_scale(objects_to_scale, unit_converter, !this->import_settings->import_units);
 
 	delete objects_to_scale;
+
+	// update scene
+	DEG_id_tag_update(&sce->id, DEG_TAG_COPY_ON_WRITE);
+	DEG_relations_tag_update(bmain);
+	WM_event_add_notifier(mContext, NC_OBJECT | ND_TRANSFORM, NULL);
 }
 
 
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp
index b07c6518050..8046efd2335 100644
--- a/source/blender/collada/SkinInfo.cpp
+++ b/source/blender/collada/SkinInfo.cpp
@@ -242,9 +242,6 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique
 	invert_m4_m4(ob->parentinv, workob.obmat);
 
 	DEG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA);
-
-	DEG_relations_tag_update(bmain);
-	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 #endif
 	copy_m4_m4(ob->obmat, bind_shape_matrix);
 	BKE_object_apply_mat4(ob, ob->obmat, 0, 0);
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 4ded9bd2d86..22ddeb4edb7 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -128,12 +128,6 @@ int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space)
 	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
-	DEG_relations_tag_update(bmain);
-	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
-#endif
-
 	return true;
 }