diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 16:15:51 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 16:15:51 +0300 |
| commit | fd19069999e3655206ccf21dc851801a325dea5d (patch) | |
| tree | 54d5d865c13e42ef50829e6358afdf5790d2df74 /source/blender/collada/ArmatureImporter.cpp | |
| parent | 66407e15cb5136bdbed45b9e0576b1e9863c3f4f (diff) | |
Cleanup: remove last G.main's from Collada code.
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 344a73cfa6f..28e962d62c0 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -54,8 +54,9 @@ static const char *bc_get_joint_name(T *node) } -ArmatureImporter::ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Scene *sce, const ImportSettings *import_settings) : +ArmatureImporter::ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Main *bmain, Scene *sce, const ImportSettings *import_settings) : TransformReader(conv), + m_bmain(bmain), scene(sce), unit_converter(conv), import_settings(import_settings), @@ -409,7 +410,7 @@ Object *ArmatureImporter::get_empty_for_leaves() { if (empty) return empty; - empty = bc_add_object(scene, OB_EMPTY, NULL); + empty = bc_add_object(m_bmain, scene, OB_EMPTY, NULL); empty->empty_drawtype = OB_EMPTY_SPHERE; return empty; @@ -584,7 +585,7 @@ Object *ArmatureImporter::create_armature_bones(Main *bmain, SkinInfo& skin) ob_arm = skin.set_armature(shared); } else { - ob_arm = skin.create_armature(scene); //once for every armature + ob_arm = skin.create_armature(m_bmain, scene); //once for every armature } // enter armature edit mode |