From: Ferran Sole <ferran.sole@samsung.com>
Date: Wed, 6 Jul 2016 10:53:59 +0000 (+0100)
Subject: Fix bug in mesh-renderer which failed to render using textureless shader
X-Git-Tag: dali_1.1.42~2^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=8ffce630f5b68c49106d08495504c68332993056;ds=sidebyside

Fix bug in mesh-renderer which failed to render using textureless shader

Change-Id: Ief03f64697fcf11750a2dd2bc3bea1255fe33f13
---

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 )