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:
authorGaia Clary <gaia.clary@machinimatrix.org>2018-01-26 15:13:54 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2018-01-26 15:37:45 +0300
commit376fc19b240299857b088a1a21ced7e8b9cceacc (patch)
tree288f0c376cc63190abe1d3d8f6df1d77fc15d7f6 /source/blender/collada/ArmatureImporter.h
parentf71d8f6b4889a97f79c37e878145a51d43cd619e (diff)
fix:T53271 now using the context scene layer as requested
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 17173f157e5..f260bb2307c 100644
--- a/source/blender/collada/ArmatureImporter.h
+++ b/source/blender/collada/ArmatureImporter.h
@@ -63,6 +63,7 @@ class ArmatureImporter : private TransformReader
{
private:
Scene *scene;
+ ViewLayer *view_layer;
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, Scene *sce, ViewLayer *view_layer, const ImportSettings *import_settings);
~ArmatureImporter();
void add_root_joint(COLLADAFW::Node *node, Object *parent);