Merge "Flexbox UI control implementation" 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 0bd9840..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
@@ -82,12 +82,13 @@ public:
       ACTOR_PROPERTY,
       ITEMVIEW,
       ITEMFACTORY,
+      SCROLLVIEW,
       RENDER_TASK,
       RENDER_TASK_LIST,
       TIMER,
       SHADER,
       SAMPLER,
-      MATERIAL,
+      TEXTURE_SET,
       GEOMETRY,
       RENDERER,
       PROPERTY_BUFFER,