projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "DALi C# binding - Write pure C# Color & Position classes and use typemaps...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
mesh
/
mesh-visual.h
diff --git
a/dali-toolkit/internal/visuals/mesh/mesh-visual.h
b/dali-toolkit/internal/visuals/mesh/mesh-visual.h
index
1762f46
..
75b4a86
100644
(file)
--- a/
dali-toolkit/internal/visuals/mesh/mesh-visual.h
+++ b/
dali-toolkit/internal/visuals/mesh/mesh-visual.h
@@
-70,11
+70,6
@@
public:
public: // from Visual
/**
public: // from Visual
/**
- * @copydoc Visual::Base::SetSize
- */
- virtual void SetSize( const Vector2& size );
-
- /**
* @copydoc Visual::Base::CreatePropertyMap
*/
virtual void DoCreatePropertyMap( Property::Map& map ) const;
* @copydoc Visual::Base::CreatePropertyMap
*/
virtual void DoCreatePropertyMap( Property::Map& map ) const;
@@
-104,9
+99,14
@@
protected:
virtual ~MeshVisual();
/**
virtual ~MeshVisual();
/**
- * @copydoc Visual::Base::DoInitialize
+ * @copydoc Visual::Base::DoSetProperties
+ */
+ virtual void DoSetProperties( const Property::Map& propertyMap );
+
+ /**
+ * @copydoc Visual::Base::OnSetTransform
*/
*/
- virtual void
DoInitialize( Actor& actor, const Property::Map& propertyMap
);
+ virtual void
OnSetTransform(
);
/**
* @copydoc Visual::Base::DoSetOnStage
/**
* @copydoc Visual::Base::DoSetOnStage