summaryrefslogtreecommitdiffstats
path: root/core/object.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-05-14 23:48:23 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-05-14 23:48:45 -0300
commitbed3efb17ede58a2bfc177b47cb3a49091aea30a (patch)
tree81708b952559e76d38902afac2663a77f8974688 /core/object.h
parent7913e792acd656469b29fb90be1dbb7c06a855ba (diff)
downloadredot-engine-bed3efb17ede58a2bfc177b47cb3a49091aea30a.tar.gz
New reworked AnimatedSprite!
-New SpriteFrames editor, with support for drag&drop, multiple animation sets, animation speed and loop. -New AnimatedSprite, with support for all the new features! AnimatedSprite3D has not been updated yet. -Added support for drag&drop to other editors, such as resourcepreload, sample library, etc.
Diffstat (limited to 'core/object.h')
-rw-r--r--core/object.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/object.h b/core/object.h
index dcebf9b2a2..c34440100f 100644
--- a/core/object.h
+++ b/core/object.h
@@ -274,12 +274,12 @@ virtual void _get_property_listv(List<PropertyInfo> *p_list,bool p_reversed) con
}\
p_list->push_back( PropertyInfo(Variant::NIL,get_type_static(),PROPERTY_HINT_NONE,String(),PROPERTY_USAGE_CATEGORY));\
if (!_is_gpl_reversed())\
- ObjectTypeDB::get_property_list(#m_type,p_list,true);\
+ ObjectTypeDB::get_property_list(#m_type,p_list,true,this);\
if (m_type::_get_get_property_list() != m_inherits::_get_get_property_list()) {\
_get_property_list(p_list);\
}\
if (_is_gpl_reversed())\
- ObjectTypeDB::get_property_list(#m_type,p_list,true);\
+ ObjectTypeDB::get_property_list(#m_type,p_list,true,this);\
if (p_reversed) {\
m_inherits::_get_property_listv(p_list,p_reversed);\
}\
@@ -462,6 +462,9 @@ protected:
void _clear_internal_resource_paths(const Variant &p_var);
+friend class ObjectTypeDB;
+ virtual void _validate_property(PropertyInfo& property) const;
+
public: //should be protected, but bug in clang++
static void initialize_type();
_FORCE_INLINE_ static void register_custom_data_to_otdb() {};