Merge branch 'master' into blender2.8
[blender.git] / source / blender / collada / SkinInfo.h
index fdfee0a943a3ecacf91e2754cc1b7389f197ca4f..39808c546b1cad21386b78e2eea27aa6bb8134a5 100644 (file)
@@ -99,7 +99,7 @@ public:
        void set_controller(const COLLADAFW::SkinController* co);
 
        // called from write_controller
-       Object *create_armature(Scene *scene, ViewLayer *view_layer);
+       Object *create_armature(Main *bmain, Scene *scene, ViewLayer *view_layer);
 
        Object* set_armature(Object *ob_arm);