From: Kimmo Hoikka Date: Mon, 13 Jul 2015 17:50:28 +0000 (-0700) Subject: Merge "Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D" into devel/master X-Git-Tag: dali_1.0.49~14 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=ec4cd25a0466c6580d4a8f3fbba07340dfa2de1d;hp=-c;ds=sidebyside Merge "Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D" into devel/master --- ec4cd25a0466c6580d4a8f3fbba07340dfa2de1d diff --combined plugins/dali-script-v8/src/constants/constants-wrapper.cpp index 77f8a7f,7f51554..1571273 --- a/plugins/dali-script-v8/src/constants/constants-wrapper.cpp +++ b/plugins/dali-script-v8/src/constants/constants-wrapper.cpp @@@ -154,7 -154,7 +154,7 @@@ const IntegerPair EnumTable[] { "POSITION_INHERITANCE_DONT_INHERIT_POSITION", DONT_INHERIT_POSITION }, { "DRAW_MODE_NORMAL", DrawMode::NORMAL }, - { "DRAW_MODE_OVERLAY", DrawMode::OVERLAY }, + { "DRAW_MODE_OVERLAY_2D", DrawMode::OVERLAY_2D }, { "DRAW_MODE_STENCIL", DrawMode::STENCIL }, { "IMAGE_LOAD_POLICY_IMMEDIATE", ResourceImage::IMMEDIATE }, @@@ -204,6 -204,12 +204,6 @@@ { "BLEND_EQUATION_SUBTRACT", BlendingEquation::SUBTRACT }, { "BLEND_EQUATION_REVERSE_SUBTRACT", BlendingEquation::REVERSE_SUBTRACT }, - - { "CULL_FACE_DISABLE", CullNone }, - { "CULL_FRONT_FACE", CullFront }, - { "CULL_BACK_FACE", CullBack }, - { "CULL_FRONT_AND_BACK_FACE", CullFrontAndBack }, - { "CAMERA_FREE_LOOK" , Camera::FREE_LOOK }, { "CAMERA_LOOK_AT_TARGET" , Camera::LOOK_AT_TARGET }, { "CAMERA_PERSPECTIVE_PROJECTION" , Camera::PERSPECTIVE_PROJECTION },