X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbubble-effect%2Fbubble-emitter-impl.h;h=ef9438671609b7d5572ad15a749f2e6c82c11628;hp=1509248d088b26ff00d88590492c1121fb3774e1;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=a9e64686388c10743bf66a9c5d6e0aa06e198c70 diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h index 1509248..ef94386 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h @@ -158,7 +158,7 @@ private: CameraActor mCameraActor; ///< The render task views the scene from the perspective of this actor. Geometry mMeshGeometry; ///< The mesh geometry which contains the vertices and indices data - Material mMaterial; ///< The material which controls the bubble display + TextureSet mTextureSet; ///< The texture set which controls the bubble display std::vector mBubbleActors; ///< The meshActor vector, its size is mNumShader. Vector2 mMovementArea; ///< The size of the bubble moving area, usually the same size as the background image actor.