Merge "Ensure BaseHandle class move noexcept (core public-api)" into 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 c19e514..3dfd9ea 100644 (file)
--- a/dali/public-api/rendering/renderer.h
+++ b/dali/public-api/rendering/renderer.h
@@ -62,10 +62,11 @@ namespace BlendMode
  */
 enum Type
 {
-  OFF,            ///< Blending is disabled.                                                    @SINCE_1_1.43
-  AUTO,           ///< Blending is enabled if there is alpha channel. This is the default mode. @SINCE_1_1.43
-  ON,             ///< Blending is enabled.                                                     @SINCE_1_1.43
-  ON_WITHOUT_CULL ///< Blending is enabled, and don't cull the renderer                         @SINCE_2_0.43
+  OFF,               ///< Blending is disabled.                                                    @SINCE_1_1.43
+  AUTO,              ///< Blending is enabled if there is alpha channel. This is the default mode. @SINCE_1_1.43
+  ON,                ///< Blending is enabled.                                                     @SINCE_1_1.43
+  ON_WITHOUT_CULL,   ///< Blending is enabled, and don't cull the renderer                         @SINCE_2_0.43
+  USE_ACTOR_OPACITY  ///< Blending is enabled when the actor is not opaque                         @SINCE_2_2.7
 };
 
 } // namespace BlendMode
@@ -483,7 +484,7 @@ public:
    * @SINCE_1_9.22
    * @param[in] rhs A reference to the moved handle
    */
-  Renderer(Renderer&& rhs);
+  Renderer(Renderer&& rhs) noexcept;
 
   /**
    * @brief Move assignment operator.
@@ -492,7 +493,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this handle
    */
-  Renderer& operator=(Renderer&& rhs);
+  Renderer& operator=(Renderer&& rhs) noexcept;
 
   /**
    * @brief Sets the geometry to be used by this renderer.