diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-01-30 11:28:20 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-08 15:02:28 +0000 |
| commit | 4b22aa1904337e595cca0b6f46b445d555db7d6b (patch) | |
| tree | a8c9f26628c41dae1ae48ba6853b07d50f96a3f8 /src/plugins | |
| parent | 782907f3f15def5f050bb69f95575d5e3f40b61d (diff) | |
Texture API refactoring
* Added LoadTextureDataJob
* QAbstractTextureProvider: maximum layers property
* Automatic QAbstractTextureProvider::TextureFormat added
* material-qml should work perfectly with that patch.
Change-Id: I3f92f13b783155798772086304a30126a4fc687d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp index c29226fad..aeb27a3ab 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser.cpp +++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp @@ -594,7 +594,7 @@ void AssimpParser::loadEmbeddedTexture(uint textureIndex) { aiTexture *assimpTexture = m_scene->m_aiScene->mTextures[textureIndex]; QAbstractTextureProvider *texture = new QTexture2D(); - TexImageDataPtr textureData(new TexImageData(0, 0)); + TexImageDataPtr textureData(new TexImageData()); bool isCompressed = assimpTexture->mHeight == 0; uint textureSize = assimpTexture->mWidth * |