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 branch 'devel/master' into devel/new_mesh
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
atlas-manager
/
atlas-manager.cpp
diff --git
a/dali-toolkit/internal/atlas-manager/atlas-manager.cpp
b/dali-toolkit/internal/atlas-manager/atlas-manager.cpp
index
977c8dc
..
e6b041c
100644
(file)
--- a/
dali-toolkit/internal/atlas-manager/atlas-manager.cpp
+++ b/
dali-toolkit/internal/atlas-manager/atlas-manager.cpp
@@
-69,11
+69,13
@@
bool AtlasManager::Remove( ImageId id )
void AtlasManager::GenerateMeshData( ImageId id,
const Vector2& position,
void AtlasManager::GenerateMeshData( ImageId id,
const Vector2& position,
- Mesh2D& mesh )
+ Mesh2D& mesh,
+ bool addReference )
{
GetImplementation(*this).GenerateMeshData( id,
position,
{
GetImplementation(*this).GenerateMeshData( id,
position,
- mesh );
+ mesh,
+ addReference );
}
void AtlasManager::StitchMesh( Mesh2D& first,
}
void AtlasManager::StitchMesh( Mesh2D& first,