Merge branch 'master' into blender2.8
[blender.git] / source / blender / collada / SkinInfo.cpp
index 7ec3f04aabfa0056443af2a3471e30305490024b..b07c6518050be2ee8f831cbf06b7778c82222458 100644 (file)
@@ -159,9 +159,9 @@ void SkinInfo::set_controller(const COLLADAFW::SkinController *co)
 }
 
 // called from write_controller
-Object *SkinInfo::create_armature(Scene *scene, ViewLayer *view_layer)
+Object *SkinInfo::create_armature(Main *bmain, Scene *scene, ViewLayer *view_layer)
 {
-       ob_arm = bc_add_object(scene, view_layer, OB_ARMATURE, NULL);
+       ob_arm = bc_add_object(bmain, scene, view_layer, OB_ARMATURE, NULL);
        return ob_arm;
 }