Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-06-06 16:50:24 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-06 16:50:24 +0300
commit48e871ab1d57ef2e95047b2be5718cee5d3cefe6 (patch)
tree65088effec7dac68ea72fe2ae60e32df544d99a6 /source/blender/collada/ArmatureImporter.h
parentbfbd85e9d66be3793e51ef989f793bdd69214493 (diff)
Cleanup: Nuke moar G.main usages...
Diffstat (limited to 'source/blender/collada/ArmatureImporter.h')
-rw-r--r--source/blender/collada/ArmatureImporter.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h
index 17173f157e5..fbce14f1b05 100644
--- a/source/blender/collada/ArmatureImporter.h
+++ b/source/blender/collada/ArmatureImporter.h
@@ -129,8 +129,8 @@ private:
ArmatureJoints& get_armature_joints(Object *ob_arm);
#endif
- Object *create_armature_bones(SkinInfo& skin);
- void create_armature_bones(std::vector<Object *> &arm_objs);
+ Object *create_armature_bones(Main *bmain, SkinInfo& skin);
+ void create_armature_bones(Main *bmain, std::vector<Object *> &arm_objs);
/** TagsMap typedef for uid_tags_map. */
typedef std::map<std::string, ExtraTags*> TagsMap;