diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-21 13:40:59 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-21 13:40:59 +0400 |
| commit | eea7c358c7d606f9a4df8f11d42ac5b0df28a6d4 (patch) | |
| tree | 32c72886e2007dad65c71b89c90dee891c08e5c3 /source/blender/collada/DocumentImporter.h | |
| parent | c89379e7e15aeb50a7d7106218821a17e5a7dac9 (diff) | |
| parent | 314fdb941e28d5f1fbe2acace6133d6216f4e36c (diff) | |
svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
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*); |