diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-03 17:26:41 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-03 17:26:41 +0200 |
| commit | dbd4c79c3846aca18a638a4529ad6cb4ba9be0a3 (patch) | |
| tree | a4a47defe1cacbb35f961484cb724e25d6c5bb16 /core | |
| parent | 090a5b028b44cd8978468954f58f41db9ef8abfe (diff) | |
| parent | cbf939e12149609e38fcdee40f44713f025acc59 (diff) | |
| download | redot-engine-dbd4c79c3846aca18a638a4529ad6cb4ba9be0a3.tar.gz | |
Merge pull request #82682 from dsnopek/gdextension-dont-deprecate-script-category
GDExtension: Don't deprecate old method of getting script category
Diffstat (limited to 'core')
| -rw-r--r-- | core/extension/gdextension_interface.h | 2 | ||||
| -rw-r--r-- | core/object/script_language_extension.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/core/extension/gdextension_interface.h b/core/extension/gdextension_interface.h index 35602b76dd..fbd1480e69 100644 --- a/core/extension/gdextension_interface.h +++ b/core/extension/gdextension_interface.h @@ -510,7 +510,7 @@ typedef struct { GDExtensionScriptInstanceGet get_func; GDExtensionScriptInstanceGetPropertyList get_property_list_func; GDExtensionScriptInstanceFreePropertyList free_property_list_func; - GDExtensionScriptInstanceGetClassCategory get_class_category_func; + GDExtensionScriptInstanceGetClassCategory get_class_category_func; // Optional. Set to NULL for the default behavior. GDExtensionScriptInstancePropertyCanRevert property_can_revert_func; GDExtensionScriptInstancePropertyGetRevert property_get_revert_func; diff --git a/core/object/script_language_extension.h b/core/object/script_language_extension.h index b682efec12..beb8064a33 100644 --- a/core/object/script_language_extension.h +++ b/core/object/script_language_extension.h @@ -676,13 +676,11 @@ public: if (native_info->get_class_category_func(instance, &gdext_class_category)) { p_list->push_back(PropertyInfo(gdext_class_category)); } -#ifndef DISABLE_DEPRECATED } else { Ref<Script> script = get_script(); if (script.is_valid()) { p_list->push_back(script->get_class_category()); } -#endif // DISABLE_DEPRECATED } } #endif // TOOLS_ENABLED |