Merge "Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D" into devel/master
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Mon, 13 Jul 2015 17:50:28 +0000 (10:50 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 13 Jul 2015 17:50:28 +0000 (10:50 -0700)
1  2 
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 },
      { "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      },