diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-11 02:14:56 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-11 02:14:56 +0400 |
| commit | 22dbb675c156a24880e3b1803a0f5abde53af4b8 (patch) | |
| tree | 9c36399f029fc48a4e05be92e5db4075e375c600 /source/blender/collada/DocumentImporter.h | |
| parent | 1ba194aeddef7a4d2859d7587b60c70c03387b1c (diff) | |
Fix #33437 Collada: Added scale matching for Scene imports.
Diffstat (limited to 'source/blender/collada/DocumentImporter.h')
| -rw-r--r-- | source/blender/collada/DocumentImporter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h index 76d16f38a0c..ff0cbd44043 100644 --- a/source/blender/collada/DocumentImporter.h +++ b/source/blender/collada/DocumentImporter.h @@ -77,7 +77,7 @@ public: Object* create_lamp_object(COLLADAFW::InstanceLight*, Scene*); Object* create_instance_node(Object*, COLLADAFW::Node*, COLLADAFW::Node*, Scene*, bool); void create_constraints(ExtraTags *et, Object *ob); - void write_node(COLLADAFW::Node*, COLLADAFW::Node*, Scene*, Object*, bool); + std::vector<Object *> *write_node(COLLADAFW::Node*, COLLADAFW::Node*, Scene*, Object*, bool); MTex* create_texture(COLLADAFW::EffectCommon*, COLLADAFW::Texture&, Material*, int, TexIndexTextureArrayMap&); void write_profile_COMMON(COLLADAFW::EffectCommon*, Material*); |