diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2012-03-17 10:37:26 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2012-03-17 10:37:26 +0400 |
| commit | 8634d0e9c103e4d5dc38d1876af16a7434354a53 (patch) | |
| tree | 30029e1b77b270753a250dce338615cbba81adc1 /source/blender/collada/DocumentImporter.h | |
| parent | 757c0af9c64655306dbb58883505efe22e1c460c (diff) | |
#collada instance_node import, partially fixes #27629
Patch applied in r37663 caused loss of <instance_node>s.
All parts of the smaller test file attached in the report now import.
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 179461ba59d..606218b644d 100644 --- a/source/blender/collada/DocumentImporter.h +++ b/source/blender/collada/DocumentImporter.h @@ -72,7 +72,7 @@ public: /** these should not be here */ Object* create_camera_object(COLLADAFW::InstanceCamera*, Scene*); Object* create_lamp_object(COLLADAFW::InstanceLight*, Scene*); - Object* create_instance_node(Object*, COLLADAFW::Node*, COLLADAFW::Node*, Scene*, Object*, bool); + Object* create_instance_node(Object*, COLLADAFW::Node*, COLLADAFW::Node*, Scene*, bool); void 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*); |