Merge pull request #1 from godotengine/master

pull
Rustmilian · Sep 25, 2023 · 0fff5e1 · 0fff5e1
2 parents e3c497a + df0a822
commit 0fff5e1
Show file tree

Hide file tree

Showing 82 changed files with 2,822 additions and 1,365 deletions.
diff --git a/core/extension/extension_api_dump.cpp b/core/extension/extension_api_dump.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/engine.h"
 #include "core/core_constants.h"
+#include "core/extension/gdextension_compat_hashes.h"
 #include "core/io/file_access.h"
 #include "core/io/json.h"
 #include "core/templates/pair.h"
@@ -884,11 +885,18 @@ Dictionary GDExtensionAPIDump::generate_extension_api() {
 						d2["hash"] = method->get_hash();
 
 						Vector<uint32_t> compat_hashes = ClassDB::get_method_compatibility_hashes(class_name, method_name);
+						Array compatibility;
 						if (compat_hashes.size()) {
-							Array compatibility;
 							for (int i = 0; i < compat_hashes.size(); i++) {
 								compatibility.push_back(compat_hashes[i]);
 							}
+						}
+
+#ifndef DISABLE_DEPRECATED
+						GDExtensionCompatHashes::get_legacy_hashes(class_name, method_name, compatibility);
+#endif
+
+						if (compatibility.size() > 0) {
 							d2["hash_compatibility"] = compatibility;
 						}