From 8ffce630f5b68c49106d08495504c68332993056 Mon Sep 17 00:00:00 2001 From: Ferran Sole Date: Wed, 6 Jul 2016 11:53:59 +0100 Subject: [PATCH 1/1] Fix bug in mesh-renderer which failed to render using textureless shader Change-Id: Ief03f64697fcf11750a2dd2bc3bea1255fe33f13 --- dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.cpp b/dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.cpp index 2ac1dd6..dd52948 100644 --- a/dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.cpp @@ -452,7 +452,6 @@ bool MeshRenderer::CreateGeometry() //Determine if we need to use a simpler shader to handle the provided data if( !mUseTexture || !mObjLoader.IsDiffuseMapPresent() ) { - mUseTexture = false; mShaderType = TEXTURELESS; } else if( mShaderType == ALL_TEXTURES && (!mObjLoader.IsNormalMapPresent() || !mObjLoader.IsSpecularMapPresent()) ) @@ -527,7 +526,7 @@ bool MeshRenderer::LoadTextures() { mTextureSet = TextureSet::New(); - if( mUseTexture ) + if( mShaderType != TEXTURELESS ) { Sampler sampler = Sampler::New(); if( mUseMipmapping ) -- 2.7.4