diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-05-27 16:21:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-06 16:35:32 +0200 |
| commit | c4901e24f16aa30c24c3a1ed62da59d7a4dcd396 (patch) | |
| tree | 0ee0056c63cd6e629b38651c476028d3d65c12f7 /src/3rdparty/assimp/code/BlenderLoader.cpp | |
| parent | 3b2f3adc31e467d65b31f6ec5aa3a83d23e8d162 (diff) | |
Removed warnings from assimp
Change-Id: I2ef77231ce3cc13bdf8a046c902963fc3f718086
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.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 8f9b85b26..0b5c71333 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; |