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 "C# control dashboard demo" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
model3d-view
/
model3d-view.h
diff --git
a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
index
3aa186d
..
160ca96
100644
(file)
--- a/
dali-toolkit/public-api/controls/model3d-view/model3d-view.h
+++ b/
dali-toolkit/public-api/controls/model3d-view/model3d-view.h
@@
-62,6
+62,10
@@
public:
*/
struct Property
{
+ /**
+ * @brief An enumeration of properties belonging to the TextLabel class.
+ * @SINCE_1_1.4
+ */
enum
{
GEOMETRY_URL = PROPERTY_START_INDEX, ///< name "geometryUrl", The path to the geometry file, type STRING @SINCE_1_1.4