Merge remote-tracking branch 'origin' into blender2.8
[blender.git] / source / blender / collada / AnimationImporter.cpp
index f7ea8342eae63fa84353e61f22123d1189744c8c..ee3fddbf5b7fc01cfd8eae2002caac086741d824 100644 (file)
@@ -1915,7 +1915,7 @@ Object *AnimationImporter::get_joint_object(COLLADAFW::Node *root, COLLADAFW::No
                job->lay = BKE_scene_base_find(scene, job)->lay = 2;
 
                mul_v3_fl(job->size, 0.5f);
-               DAG_id_tag_update(&job->id, OB_RECALC_OB);
+               DEG_id_tag_update(&job->id, OB_RECALC_OB);
 
                verify_adt_action((ID *)&job->id, 1);
 
@@ -1936,14 +1936,14 @@ Object *AnimationImporter::get_joint_object(COLLADAFW::Node *root, COLLADAFW::No
                if (par_job) {
                        job->parent = par_job;
 
-                       DAG_id_tag_update(&par_job->id, OB_RECALC_OB);
+                       DEG_id_tag_update(&par_job->id, OB_RECALC_OB);
                        job->parsubstr[0] = 0;
                }
 
                BKE_object_where_is_calc(scene, job);
 
                // after parenting and layer change
-               DAG_relations_tag_update(CTX_data_main(C));
+               DEG_relations_tag_update(CTX_data_main(C));
 
                joint_objects[node->getUniqueId()] = job;
        }