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
Update following the changes of blending&culling options
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-manager.h
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
index
cf774b3
..
3449362
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
@@
-84,6
+84,7
@@
public:
{
Vector2 mPosition; ///< Vertex posiiton
Vector2 mTexCoords; ///< Vertex texture co-ordinates
+ Vector4 mColor; ///< Vertex color
};
struct Mesh2D