Merge branch 'master' into blender2.8
[blender.git] / source / blender / collada / SkinInfo.cpp
index b270ac87976caf5ab7d941fc46437ea6856a50d0..b07c6518050be2ee8f831cbf06b7778c82222458 100644 (file)
@@ -159,9 +159,9 @@ void SkinInfo::set_controller(const COLLADAFW::SkinController *co)
 }
 
 // called from write_controller
-Object *SkinInfo::create_armature(Main *bmain, Scene *scene)
+Object *SkinInfo::create_armature(Main *bmain, Scene *scene, ViewLayer *view_layer)
 {
-       ob_arm = bc_add_object(bmain, scene, OB_ARMATURE, NULL);
+       ob_arm = bc_add_object(bmain, scene, view_layer, OB_ARMATURE, NULL);
        return ob_arm;
 }
 
@@ -241,9 +241,9 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique
        BKE_object_workob_calc_parent(scene, ob, &workob);
        invert_m4_m4(ob->parentinv, workob.obmat);
 
-       DAG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA);
+       DEG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA);
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 #endif
        copy_m4_m4(ob->obmat, bind_shape_matrix);