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-14 16:15:51 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-14 16:15:51 +0300
commitfd19069999e3655206ccf21dc851801a325dea5d (patch)
tree54d5d865c13e42ef50829e6358afdf5790d2df74 /source/blender/collada/ArmatureImporter.h
parent66407e15cb5136bdbed45b9e0576b1e9863c3f4f (diff)
Cleanup: remove last G.main's from Collada code.
Diffstat (limited to 'source/blender/collada/ArmatureImporter.h')
-rw-r--r--source/blender/collada/ArmatureImporter.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h
index b637ec89f8b..a215b186f75 100644
--- a/source/blender/collada/ArmatureImporter.h
+++ b/source/blender/collada/ArmatureImporter.h
@@ -62,6 +62,7 @@ extern "C" {
class ArmatureImporter : private TransformReader
{
private:
+ Main *m_bmain;
Scene *scene;
UnitConverter *unit_converter;
const ImportSettings *import_settings;
@@ -137,7 +138,7 @@ private:
TagsMap uid_tags_map;
public:
- ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Scene *sce, const ImportSettings *import_settings);
+ ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Main *bmain, Scene *sce, const ImportSettings *import_settings);
~ArmatureImporter();
void add_root_joint(COLLADAFW::Node *node, Object *parent);