diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-06-20 14:50:17 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-06-20 14:50:17 +0400 |
| commit | 81f5679ff50fde4085b92cb39f98efd8354fc5ef (patch) | |
| tree | a269e0b427f4f65c902fe4ff51b910a996f82383 /source/blender/collada/DocumentImporter.h | |
| parent | 201052a3ffbb7070ac9ad454197a7b380097568d (diff) | |
Fix [#26821] Import Collada: instance_node still incorrectly handled
reported by David Roy
patch submitted by Camillo Dell'mour
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 e57d621eeef..5ccec534680 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*, bool); + Object* create_instance_node(Object*, COLLADAFW::Node*, COLLADAFW::Node*, Scene*, Object*, 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*); |