diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-06-27 09:31:11 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-07-17 10:14:00 +0200 |
| commit | 09687cfaade1e3baa693f02861722ea860f3c716 (patch) | |
| tree | 4d1084ee95ec45e880739ddf709ae32fe73d3caa /src/3rdparty/assimp/code/BlenderLoader.cpp | |
| parent | 22829fba69a36e447a14dcd59149164d482b3fe3 (diff) | |
Upgrade to Assimp 3.1.1
https://github.com/assimp/assimp/releases/tag/v3.1.1
This commit imports assimp 3.1.1, including CHANGES, CREDITS, LICENSE,
README, Readme.md, and code, contrib, include directories. contrib/zlib,
contrib/cppunit-1.12.1/, contrib/cppunit_note.txt were excluded in this
change.
assimp.pri was also updated.
revision.h was generated from revision.h.in.
Change-Id: I7c0597eae9eee7f06a1170968b5fef6fd46b6f0d
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/assimp/code/BlenderLoader.cpp')
| -rw-r--r-- | src/3rdparty/assimp/code/BlenderLoader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/assimp/code/BlenderLoader.cpp b/src/3rdparty/assimp/code/BlenderLoader.cpp index 0b5c71333..8f9b85b26 100644 --- a/src/3rdparty/assimp/code/BlenderLoader.cpp +++ b/src/3rdparty/assimp/code/BlenderLoader.cpp @@ -999,7 +999,7 @@ void BlenderImporter::ConvertMesh(const Scene& /*in*/, const Object* /*obj*/, co } // ------------------------------------------------------------------------------------------------ -aiCamera* BlenderImporter::ConvertCamera(const Scene& /*in*/, const Object* obj, const Camera* /*camera*/, ConversionData& /*conv_data*/) +aiCamera* BlenderImporter::ConvertCamera(const Scene& /*in*/, const Object* obj, const Camera* camera, ConversionData& /*conv_data*/) { ScopeGuard<aiCamera> out(new aiCamera()); out->mName = obj->id.name+2; @@ -1010,7 +1010,7 @@ aiCamera* BlenderImporter::ConvertCamera(const Scene& /*in*/, const Object* obj, } // ------------------------------------------------------------------------------------------------ -aiLight* BlenderImporter::ConvertLight(const Scene& /*in*/, const Object* obj, const Lamp* lamp, ConversionData& /*conv_data*/) +aiLight* BlenderImporter::ConvertLight(const Scene& in, const Object* obj, const Lamp* lamp, ConversionData& conv_data) { ScopeGuard<aiLight> out(new aiLight()); out->mName = obj->id.name+2; |