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 "Allow ImageView padding to be set to Zero" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
shared
/
base-wrapped-object.h
diff --git
a/plugins/dali-script-v8/src/shared/base-wrapped-object.h
b/plugins/dali-script-v8/src/shared/base-wrapped-object.h
index
db1c8a8
..
4cdc867
100644
(file)
--- a/
plugins/dali-script-v8/src/shared/base-wrapped-object.h
+++ b/
plugins/dali-script-v8/src/shared/base-wrapped-object.h
@@
-80,12
+80,15
@@
public:
IMAGE_ATTRIBUTES,
ACTOR,
ACTOR_PROPERTY,
+ ITEMVIEW,
+ ITEMFACTORY,
+ SCROLLVIEW,
RENDER_TASK,
RENDER_TASK_LIST,
TIMER,
SHADER,
SAMPLER,
-
MATERIAL
,
+
TEXTURE_SET
,
GEOMETRY,
RENDERER,
PROPERTY_BUFFER,