From 8634d0e9c103e4d5dc38d1876af16a7434354a53 Mon Sep 17 00:00:00 2001 From: Arystanbek Dyussenov Date: Sat, 17 Mar 2012 06:37:26 +0000 Subject: #collada instance_node import, partially fixes #27629 Patch applied in r37663 caused loss of s. All parts of the smaller test file attached in the report now import. --- source/blender/collada/DocumentImporter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/collada/DocumentImporter.h') 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*); -- cgit v1.2.3