Merge "Updated comment to remove copy+paste error." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / bubble-effect / bubble-emitter.h

diff --git a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h
index 461e564..a9a5c3a 100644 (file)
--- a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h
+++ b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h
@@ -57,7 +57,7 @@ public:
   /**
    * @brief Create an initialized BubbleEmitter.
    *
-   * @param[in] winSize The size of the bubble moving area, usually the same size as the background image actor.
+   * @param[in] winSize The size of the bubble moving area, usually the same size as the background.
    * @param[in] shapeImage The alpha channnel of this texture defines the bubble shape.
    * @param[in] maximumNumberOfBubble The maximum number of bubble needed.
    * @param[in] bubbleSizeRange The size range of the bubbles; x component is the low bound, and y component is the up bound.
@@ -140,13 +140,6 @@ public:
   void SetBubbleDensity( unsigned int density );
 
   /**
-   * @brief Enable different blending mode for rendering.
-   *
-   * @param[in] enable If false, the default blending function for RenderableActor is used.
-   */
-  void SetBlendMode( bool enable );
-
-  /**
    * @brief Add a bubble movement to the animation.
    *
    * @param[in] animation The animation reference.