From 5817a82647a2da08b91058659b70238fc7dbf2dd Mon Sep 17 00:00:00 2001 From: Ferran Sole Date: Tue, 14 Jun 2016 08:27:39 +0100 Subject: [PATCH] Fixed bug in model3d-view control Diffuse texture was being added to the TextureSet when illumination type was DIFFUSE. Diffuse shader doesn't use any textures so the TextureSet should be empty. Change-Id: I521100cb4e399f0ef673e59b612cde4bec58e219 --- dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp index cf38437..d395fb2 100644 --- a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp +++ b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp @@ -592,7 +592,7 @@ void Model3dView::LoadTextures() if( !mTextureSet ) return ; - if( mTexture0Url != "" ) + if( (mTexture0Url != "") && (mIlluminationType != Toolkit::Model3dView::DIFFUSE) ) { std::string imgUrl = mImagesUrl + mTexture0Url; -- 2.7.4