projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "Fix for the cursor position with the arabic script." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
mesh
/
mesh-renderer.h
diff --git
a/dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.h
b/dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.h
index
ede12fb
..
30d032b
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.h
+++ b/
dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.h
@@
-184,8
+184,6
@@
private:
std::string mGlossTextureUrl;
std::string mTexturesPath;
- std::string mShaderTypeString;
-
Shader mShader;
Geometry mGeometry;
TextureSet mTextureSet;
@@
-196,6
+194,7
@@
private:
ShaderType mShaderType;
bool mUseTexture;
+ bool mUseMipmapping;
};
} // namespace Internal