|
@@ -384,18 +384,6 @@ struct ObjectGDExtension {
|
|
|
* much alone defines the object model.
|
|
|
*/
|
|
|
|
|
|
-#define REVERSE_GET_PROPERTY_LIST \
|
|
|
-public: \
|
|
|
- _FORCE_INLINE_ bool _is_gpl_reversed() const { return true; }; \
|
|
|
- \
|
|
|
-private:
|
|
|
-
|
|
|
-#define UNREVERSE_GET_PROPERTY_LIST \
|
|
|
-public: \
|
|
|
- _FORCE_INLINE_ bool _is_gpl_reversed() const { return false; }; \
|
|
|
- \
|
|
|
-private:
|
|
|
-
|
|
|
#define GDCLASS(m_class, m_inherits) \
|
|
|
private: \
|
|
|
void operator=(const m_class &p_rval) {} \
|
|
@@ -507,15 +495,10 @@ protected:
|
|
|
m_inherits::_get_property_listv(p_list, p_reversed); \
|
|
|
} \
|
|
|
p_list->push_back(PropertyInfo(Variant::NIL, get_class_static(), PROPERTY_HINT_NONE, get_class_static(), PROPERTY_USAGE_CATEGORY)); \
|
|
|
- if (!_is_gpl_reversed()) { \
|
|
|
- ::ClassDB::get_property_list(#m_class, p_list, true, this); \
|
|
|
- } \
|
|
|
+ ::ClassDB::get_property_list(#m_class, p_list, true, this); \
|
|
|
if (m_class::_get_get_property_list() != m_inherits::_get_get_property_list()) { \
|
|
|
_get_property_list(p_list); \
|
|
|
} \
|
|
|
- if (_is_gpl_reversed()) { \
|
|
|
- ::ClassDB::get_property_list(#m_class, p_list, true, this); \
|
|
|
- } \
|
|
|
if (p_reversed) { \
|
|
|
m_inherits::_get_property_listv(p_list, p_reversed); \
|
|
|
} \
|
|
@@ -795,8 +778,6 @@ public:
|
|
|
return &ptr;
|
|
|
}
|
|
|
|
|
|
- bool _is_gpl_reversed() const { return false; }
|
|
|
-
|
|
|
void detach_from_objectdb();
|
|
|
_FORCE_INLINE_ ObjectID get_instance_id() const { return _instance_id; }
|
|
|
|