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
TextField Styling upgrade, Builder to use filenames
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
atlas-manager
/
atlas-manager-impl.cpp
diff --git
a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
index
15baf37
..
a5f0462
100644
(file)
--- a/
dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
+++ b/
dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
@@
-690,7
+690,8
@@
void AtlasManager::UploadImage( const BufferImage& image,
void AtlasManager::GenerateMeshData( ImageId id,
const Vector2& position,
void AtlasManager::GenerateMeshData( ImageId id,
const Vector2& position,
- Toolkit::AtlasManager::Mesh2D& meshData )
+ Toolkit::AtlasManager::Mesh2D& meshData,
+ bool addReference )
{
// Read the atlas Id to use for this image
SizeType imageId = id - 1u;
{
// Read the atlas Id to use for this image
SizeType imageId = id - 1u;
@@
-711,8
+712,11
@@
void AtlasManager::GenerateMeshData( ImageId id,
CreateMesh( atlas, width, height, position, widthInBlocks, heightInBlocks, meshData, mImageList[ imageId ] );
CreateMesh( atlas, width, height, position, widthInBlocks, heightInBlocks, meshData, mImageList[ imageId ] );
- // Mesh created so increase the reference count
- mImageList[ imageId ].mCount++;
+ // Mesh created so increase the reference count, if we're asked to
+ if ( addReference )
+ {
+ mImageList[ imageId ].mCount++;
+ }
}
Dali::Atlas AtlasManager::GetAtlasContainer( AtlasId atlas ) const
}
Dali::Atlas AtlasManager::GetAtlasContainer( AtlasId atlas ) const