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 "(Touch) Updated programming guide, Automated Tests & KeyboardFocusManager...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
renderer-string-constants.h
diff --git
a/dali-toolkit/internal/controls/renderers/renderer-string-constants.h
b/dali-toolkit/internal/controls/renderers/renderer-string-constants.h
index
ebaf29f
..
51e13f0
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/renderer-string-constants.h
+++ b/
dali-toolkit/internal/controls/renderers/renderer-string-constants.h
@@
-32,9
+32,17
@@
extern const char * const COLOR_RENDERER;
extern const char * const BORDER_RENDERER;
extern const char * const GRADIENT_RENDERER;
extern const char * const IMAGE_RENDERER;
extern const char * const BORDER_RENDERER;
extern const char * const GRADIENT_RENDERER;
extern const char * const IMAGE_RENDERER;
+extern const char * const MESH_RENDERER;
extern const char * const IMAGE_URL_NAME;
extern const char * const ATLAS_RECT_UNIFORM_NAME;
extern const char * const IMAGE_URL_NAME;
extern const char * const ATLAS_RECT_UNIFORM_NAME;
+extern const char * const COLOR;
+
+//Mesh properties
+extern const char * const OBJECT_URL;
+extern const char * const MATERIAL_URL;
+extern const char * const TEXTURES_PATH;
+extern const char * const SHADER_TYPE;
} // namespace Internal
} // namespace Internal