[dali_1.2.0] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / public-api / rendering / renderer.h

diff --git a/dali/public-api/rendering/renderer.h b/dali/public-api/rendering/renderer.h
index 3a7a7fb..1a48391 100644 (file)
--- a/dali/public-api/rendering/renderer.h
+++ b/dali/public-api/rendering/renderer.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/handle.h>                // Dali::Handle
-#include <dali/public-api/object/property-index-ranges.h> // DEFAULT_OBJECT_PROPERTY_START_INDEX
+#include <dali/public-api/object/property-index-ranges.h> // DEFAULT_RENDERER_PROPERTY_START_INDEX
 #include <dali/public-api/rendering/geometry.h>           // Dali::Geometry
 #include <dali/public-api/rendering/texture-set.h>        // Dali::TextureSet
 
@@ -41,9 +41,9 @@ namespace FaceCullingMode
  */
 enum Type
 {
-  NONE,                ///< None of the faces should be culled               @SINCE_1_1.43
-  FRONT,               ///< Cull front face, back face should never be shown @SINCE_1_1.43
-  BACK,                ///< Cull back face, back face should never be shown  @SINCE_1_1.43
+  NONE,                ///< None of the faces should be culled                 @SINCE_1_1.43
+  FRONT,               ///< Cull front face, front faces should never be shown @SINCE_1_1.43
+  BACK,                ///< Cull back face, back faces should never be shown   @SINCE_1_1.43
   FRONT_AND_BACK,      ///< Cull front and back faces; if the geometry is composed of triangles none of the faces will be shown @SINCE_1_1.43
 };
 
@@ -242,7 +242,7 @@ public:
        * @note The default value is 0
        * @SINCE_1_1.43
        */
-      DEPTH_INDEX = DEFAULT_OBJECT_PROPERTY_START_INDEX,
+      DEPTH_INDEX = DEFAULT_RENDERER_PROPERTY_START_INDEX,
 
       /**
        * @brief name "faceCullingMode", type INTEGER
@@ -420,7 +420,15 @@ public:
        * @note The default value is True
        * @SINCE_1_1.43
        */
-      WRITE_TO_COLOR_BUFFER
+      WRITE_TO_COLOR_BUFFER,
+
+      /**
+       * @brief name "batchingEnabled", type BOOLEAN
+       * @SINCE_1_2.0
+       * @see Batching
+       * @note The default value is 'false'
+       */
+      BATCHING_ENABLED
     };
   };