Merge pull request #93311 from dsnopek/gdextension-required-virtuals

GDExtension: Mark virtual function as `is_required` in `extension_api.json`

9 files changed, 80 insertions, 80 deletions

diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h
index 255eaff10d..7aa0137f4e 100644
--- a/editor/editor_file_system.h
+++ b/editor/editor_file_system.h
@@ -114,9 +114,9 @@ class EditorFileSystemImportFormatSupportQuery : public RefCounted {
 	GDCLASS(EditorFileSystemImportFormatSupportQuery, RefCounted);
 
 protected:
-	GDVIRTUAL0RC(bool, _is_active)
-	GDVIRTUAL0RC(Vector<String>, _get_file_extensions)
-	GDVIRTUAL0RC(bool, _query)
+	GDVIRTUAL0RC_REQUIRED(bool, _is_active)
+	GDVIRTUAL0RC_REQUIRED(Vector<String>, _get_file_extensions)
+	GDVIRTUAL0RC_REQUIRED(bool, _query)
 	static void _bind_methods() {
 		GDVIRTUAL_BIND(_is_active);
 		GDVIRTUAL_BIND(_get_file_extensions);
@@ -126,17 +126,17 @@ protected:
 public:
 	virtual bool is_active() const {
 		bool ret = false;
-		GDVIRTUAL_REQUIRED_CALL(_is_active, ret);
+		GDVIRTUAL_CALL(_is_active, ret);
 		return ret;
 	}
 	virtual Vector<String> get_file_extensions() const {
 		Vector<String> ret;
-		GDVIRTUAL_REQUIRED_CALL(_get_file_extensions, ret);
+		GDVIRTUAL_CALL(_get_file_extensions, ret);
 		return ret;
 	}
 	virtual bool query() {
 		bool ret = false;
-		GDVIRTUAL_REQUIRED_CALL(_query, ret);
+		GDVIRTUAL_CALL(_query, ret);
 		return ret;
 	}
 };
diff --git a/editor/editor_script.cpp b/editor/editor_script.cpp
index 30a4b6811c..6968c7f25a 100644
--- a/editor/editor_script.cpp
+++ b/editor/editor_script.cpp
@@ -78,7 +78,7 @@ EditorInterface *EditorScript::get_editor_interface() const {
 }
 
 void EditorScript::run() {
-	GDVIRTUAL_REQUIRED_CALL(_run);
+	GDVIRTUAL_CALL(_run);
 }
 
 void EditorScript::_bind_methods() {
diff --git a/editor/editor_script.h b/editor/editor_script.h
index 72e7641df7..b0724c31c0 100644
--- a/editor/editor_script.h
+++ b/editor/editor_script.h
@@ -44,7 +44,7 @@ class EditorScript : public RefCounted {
 protected:
 	static void _bind_methods();
 
-	GDVIRTUAL0(_run)
+	GDVIRTUAL0_REQUIRED(_run)
 
 public:
 	void add_root_node(Node *p_node);
diff --git a/editor/editor_vcs_interface.cpp b/editor/editor_vcs_interface.cpp
index f4745b8730..6a5d49e41a 100644
--- a/editor/editor_vcs_interface.cpp
+++ b/editor/editor_vcs_interface.cpp
@@ -41,17 +41,17 @@ void EditorVCSInterface::popup_error(const String &p_msg) {
 
 bool EditorVCSInterface::initialize(const String &p_project_path) {
 	bool result = false;
-	GDVIRTUAL_REQUIRED_CALL(_initialize, p_project_path, result);
+	GDVIRTUAL_CALL(_initialize, p_project_path, result);
 	return result;
 }
 
 void EditorVCSInterface::set_credentials(const String &p_username, const String &p_password, const String &p_ssh_public_key, const String &p_ssh_private_key, const String &p_ssh_passphrase) {
-	GDVIRTUAL_REQUIRED_CALL(_set_credentials, p_username, p_password, p_ssh_public_key, p_ssh_private_key, p_ssh_passphrase);
+	GDVIRTUAL_CALL(_set_credentials, p_username, p_password, p_ssh_public_key, p_ssh_private_key, p_ssh_passphrase);
 }
 
 List<String> EditorVCSInterface::get_remotes() {
 	TypedArray<String> result;
-	if (!GDVIRTUAL_REQUIRED_CALL(_get_remotes, result)) {
+	if (!GDVIRTUAL_CALL(_get_remotes, result)) {
 		return {};
 	}
 
@@ -64,7 +64,7 @@ List<String> EditorVCSInterface::get_remotes() {
 
 List<EditorVCSInterface::StatusFile> EditorVCSInterface::get_modified_files_data() {
 	TypedArray<Dictionary> result;
-	if (!GDVIRTUAL_REQUIRED_CALL(_get_modified_files_data, result)) {
+	if (!GDVIRTUAL_CALL(_get_modified_files_data, result)) {
 		return {};
 	}
 
@@ -76,24 +76,24 @@ List<EditorVCSInterface::StatusFile> EditorVCSInterface::get_modified_files_data
 }
 
 void EditorVCSInterface::stage_file(const String &p_file_path) {
-	GDVIRTUAL_REQUIRED_CALL(_stage_file, p_file_path);
+	GDVIRTUAL_CALL(_stage_file, p_file_path);
 }
 
 void EditorVCSInterface::unstage_file(const String &p_file_path) {
-	GDVIRTUAL_REQUIRED_CALL(_unstage_file, p_file_path);
+	GDVIRTUAL_CALL(_unstage_file, p_file_path);
 }
 
 void EditorVCSInterface::discard_file(const String &p_file_path) {
-	GDVIRTUAL_REQUIRED_CALL(_discard_file, p_file_path);
+	GDVIRTUAL_CALL(_discard_file, p_file_path);
 }
 
 void EditorVCSInterface::commit(const String &p_msg) {
-	GDVIRTUAL_REQUIRED_CALL(_commit, p_msg);
+	GDVIRTUAL_CALL(_commit, p_msg);
 }
 
 List<EditorVCSInterface::DiffFile> EditorVCSInterface::get_diff(const String &p_identifier, TreeArea p_area) {
 	TypedArray<Dictionary> result;
-	if (!GDVIRTUAL_REQUIRED_CALL(_get_diff, p_identifier, int(p_area), result)) {
+	if (!GDVIRTUAL_CALL(_get_diff, p_identifier, int(p_area), result)) {
 		return {};
 	}
 
@@ -106,7 +106,7 @@ List<EditorVCSInterface::DiffFile> EditorVCSInterface::get_diff(const String &p_
 
 List<EditorVCSInterface::Commit> EditorVCSInterface::get_previous_commits(int p_max_commits) {
 	TypedArray<Dictionary> result;
-	if (!GDVIRTUAL_REQUIRED_CALL(_get_previous_commits, p_max_commits, result)) {
+	if (!GDVIRTUAL_CALL(_get_previous_commits, p_max_commits, result)) {
 		return {};
 	}
 
@@ -119,7 +119,7 @@ List<EditorVCSInterface::Commit> EditorVCSInterface::get_previous_commits(int p_
 
 List<String> EditorVCSInterface::get_branch_list() {
 	TypedArray<String> result;
-	if (!GDVIRTUAL_REQUIRED_CALL(_get_branch_list, result)) {
+	if (!GDVIRTUAL_CALL(_get_branch_list, result)) {
 		return {};
 	}
 
@@ -131,48 +131,48 @@ List<String> EditorVCSInterface::get_branch_list() {
 }
 
 void EditorVCSInterface::create_branch(const String &p_branch_name) {
-	GDVIRTUAL_REQUIRED_CALL(_create_branch, p_branch_name);
+	GDVIRTUAL_CALL(_create_branch, p_branch_name);
 }
 
 void EditorVCSInterface::create_remote(const String &p_remote_name, const String &p_remote_url) {
-	GDVIRTUAL_REQUIRED_CALL(_create_remote, p_remote_name, p_remote_url);
+	GDVIRTUAL_CALL(_create_remote, p_remote_name, p_remote_url);
 }
 
 void EditorVCSInterface::remove_branch(const String &p_branch_name) {
-	GDVIRTUAL_REQUIRED_CALL(_remove_branch, p_branch_name);
+	GDVIRTUAL_CALL(_remove_branch, p_branch_name);
 }
 
 void EditorVCSInterface::remove_remote(const String &p_remote_name) {
-	GDVIRTUAL_REQUIRED_CALL(_remove_remote, p_remote_name);
+	GDVIRTUAL_CALL(_remove_remote, p_remote_name);
 }
 
 String EditorVCSInterface::get_current_branch_name() {
 	String result;
-	GDVIRTUAL_REQUIRED_CALL(_get_current_branch_name, result);
+	GDVIRTUAL_CALL(_get_current_branch_name, result);
 	return result;
 }
 
 bool EditorVCSInterface::checkout_branch(const String &p_branch_name) {
 	bool result = false;
-	GDVIRTUAL_REQUIRED_CALL(_checkout_branch, p_branch_name, result);
+	GDVIRTUAL_CALL(_checkout_branch, p_branch_name, result);
 	return result;
 }
 
 void EditorVCSInterface::pull(const String &p_remote) {
-	GDVIRTUAL_REQUIRED_CALL(_pull, p_remote);
+	GDVIRTUAL_CALL(_pull, p_remote);
 }
 
 void EditorVCSInterface::push(const String &p_remote, bool p_force) {
-	GDVIRTUAL_REQUIRED_CALL(_push, p_remote, p_force);
+	GDVIRTUAL_CALL(_push, p_remote, p_force);
 }
 
 void EditorVCSInterface::fetch(const String &p_remote) {
-	GDVIRTUAL_REQUIRED_CALL(_fetch, p_remote);
+	GDVIRTUAL_CALL(_fetch, p_remote);
 }
 
 List<EditorVCSInterface::DiffHunk> EditorVCSInterface::get_line_diff(const String &p_file_path, const String &p_text) {
 	TypedArray<Dictionary> result;
-	if (!GDVIRTUAL_REQUIRED_CALL(_get_line_diff, p_file_path, p_text, result)) {
+	if (!GDVIRTUAL_CALL(_get_line_diff, p_file_path, p_text, result)) {
 		return {};
 	}
 
@@ -185,13 +185,13 @@ List<EditorVCSInterface::DiffHunk> EditorVCSInterface::get_line_diff(const Strin
 
 bool EditorVCSInterface::shut_down() {
 	bool result = false;
-	GDVIRTUAL_REQUIRED_CALL(_shut_down, result);
+	GDVIRTUAL_CALL(_shut_down, result);
 	return result;
 }
 
 String EditorVCSInterface::get_vcs_name() {
 	String result;
-	GDVIRTUAL_REQUIRED_CALL(_get_vcs_name, result);
+	GDVIRTUAL_CALL(_get_vcs_name, result);
 	return result;
 }
 
diff --git a/editor/editor_vcs_interface.h b/editor/editor_vcs_interface.h
index 8fcd45756a..a425682bed 100644
--- a/editor/editor_vcs_interface.h
+++ b/editor/editor_vcs_interface.h
@@ -106,29 +106,29 @@ protected:
 	StatusFile _convert_status_file(const Dictionary &p_status_file);
 
 	// Proxy endpoints for extensions to implement
-	GDVIRTUAL1R(bool, _initialize, String);
-	GDVIRTUAL5(_set_credentials, String, String, String, String, String);
-	GDVIRTUAL0R(TypedArray<Dictionary>, _get_modified_files_data);
-	GDVIRTUAL1(_stage_file, String);
-	GDVIRTUAL1(_unstage_file, String);
-	GDVIRTUAL1(_discard_file, String);
-	GDVIRTUAL1(_commit, String);
-	GDVIRTUAL2R(TypedArray<Dictionary>, _get_diff, String, int);
-	GDVIRTUAL0R(bool, _shut_down);
-	GDVIRTUAL0R(String, _get_vcs_name);
-	GDVIRTUAL1R(TypedArray<Dictionary>, _get_previous_commits, int);
-	GDVIRTUAL0R(TypedArray<String>, _get_branch_list);
-	GDVIRTUAL0R(TypedArray<String>, _get_remotes);
-	GDVIRTUAL1(_create_branch, String);
-	GDVIRTUAL1(_remove_branch, String);
-	GDVIRTUAL2(_create_remote, String, String);
-	GDVIRTUAL1(_remove_remote, String);
-	GDVIRTUAL0R(String, _get_current_branch_name);
-	GDVIRTUAL1R(bool, _checkout_branch, String);
-	GDVIRTUAL1(_pull, String);
-	GDVIRTUAL2(_push, String, bool);
-	GDVIRTUAL1(_fetch, String);
-	GDVIRTUAL2R(TypedArray<Dictionary>, _get_line_diff, String, String);
+	GDVIRTUAL1R_REQUIRED(bool, _initialize, String);
+	GDVIRTUAL5_REQUIRED(_set_credentials, String, String, String, String, String);
+	GDVIRTUAL0R_REQUIRED(TypedArray<Dictionary>, _get_modified_files_data);
+	GDVIRTUAL1_REQUIRED(_stage_file, String);
+	GDVIRTUAL1_REQUIRED(_unstage_file, String);
+	GDVIRTUAL1_REQUIRED(_discard_file, String);
+	GDVIRTUAL1_REQUIRED(_commit, String);
+	GDVIRTUAL2R_REQUIRED(TypedArray<Dictionary>, _get_diff, String, int);
+	GDVIRTUAL0R_REQUIRED(bool, _shut_down);
+	GDVIRTUAL0R_REQUIRED(String, _get_vcs_name);
+	GDVIRTUAL1R_REQUIRED(TypedArray<Dictionary>, _get_previous_commits, int);
+	GDVIRTUAL0R_REQUIRED(TypedArray<String>, _get_branch_list);
+	GDVIRTUAL0R_REQUIRED(TypedArray<String>, _get_remotes);
+	GDVIRTUAL1_REQUIRED(_create_branch, String);
+	GDVIRTUAL1_REQUIRED(_remove_branch, String);
+	GDVIRTUAL2_REQUIRED(_create_remote, String, String);
+	GDVIRTUAL1_REQUIRED(_remove_remote, String);
+	GDVIRTUAL0R_REQUIRED(String, _get_current_branch_name);
+	GDVIRTUAL1R_REQUIRED(bool, _checkout_branch, String);
+	GDVIRTUAL1_REQUIRED(_pull, String);
+	GDVIRTUAL2_REQUIRED(_push, String, bool);
+	GDVIRTUAL1_REQUIRED(_fetch, String);
+	GDVIRTUAL2R_REQUIRED(TypedArray<Dictionary>, _get_line_diff, String, String);
 
 public:
 	static EditorVCSInterface *get_singleton();
diff --git a/editor/export/editor_export_platform_extension.cpp b/editor/export/editor_export_platform_extension.cpp
index 5b75ff19a4..b4f338437f 100644
--- a/editor/export/editor_export_platform_extension.cpp
+++ b/editor/export/editor_export_platform_extension.cpp
@@ -81,7 +81,7 @@ void EditorExportPlatformExtension::_bind_methods() {
 
 void EditorExportPlatformExtension::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) const {
 	Vector<String> ret;
-	if (GDVIRTUAL_REQUIRED_CALL(_get_preset_features, p_preset, ret) && r_features) {
+	if (GDVIRTUAL_CALL(_get_preset_features, p_preset, ret) && r_features) {
 		for (const String &E : ret) {
 			r_features->push_back(E);
 		}
@@ -144,19 +144,19 @@ String EditorExportPlatformExtension::get_export_option_warning(const EditorExpo
 
 String EditorExportPlatformExtension::get_os_name() const {
 	String ret;
-	GDVIRTUAL_REQUIRED_CALL(_get_os_name, ret);
+	GDVIRTUAL_CALL(_get_os_name, ret);
 	return ret;
 }
 
 String EditorExportPlatformExtension::get_name() const {
 	String ret;
-	GDVIRTUAL_REQUIRED_CALL(_get_name, ret);
+	GDVIRTUAL_CALL(_get_name, ret);
 	return ret;
 }
 
 Ref<Texture2D> EditorExportPlatformExtension::get_logo() const {
 	Ref<Texture2D> ret;
-	GDVIRTUAL_REQUIRED_CALL(_get_logo, ret);
+	GDVIRTUAL_CALL(_get_logo, ret);
 	return ret;
 }
 
@@ -238,7 +238,7 @@ bool EditorExportPlatformExtension::has_valid_export_configuration(const Ref<Edi
 	bool ret = false;
 	config_error = r_error;
 	config_missing_templates = r_missing_templates;
-	if (GDVIRTUAL_REQUIRED_CALL(_has_valid_export_configuration, p_preset, p_debug, ret)) {
+	if (GDVIRTUAL_CALL(_has_valid_export_configuration, p_preset, p_debug, ret)) {
 		r_error = config_error;
 		r_missing_templates = config_missing_templates;
 	}
@@ -248,7 +248,7 @@ bool EditorExportPlatformExtension::has_valid_export_configuration(const Ref<Edi
 bool EditorExportPlatformExtension::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
 	bool ret = false;
 	config_error = r_error;
-	if (GDVIRTUAL_REQUIRED_CALL(_has_valid_project_configuration, p_preset, ret)) {
+	if (GDVIRTUAL_CALL(_has_valid_project_configuration, p_preset, ret)) {
 		r_error = config_error;
 	}
 	return ret;
@@ -257,7 +257,7 @@ bool EditorExportPlatformExtension::has_valid_project_configuration(const Ref<Ed
 List<String> EditorExportPlatformExtension::get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const {
 	List<String> ret_list;
 	Vector<String> ret;
-	if (GDVIRTUAL_REQUIRED_CALL(_get_binary_extensions, p_preset, ret)) {
+	if (GDVIRTUAL_CALL(_get_binary_extensions, p_preset, ret)) {
 		for (const String &E : ret) {
 			ret_list.push_back(E);
 		}
@@ -269,7 +269,7 @@ Error EditorExportPlatformExtension::export_project(const Ref<EditorExportPreset
 	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
 
 	Error ret = FAILED;
-	GDVIRTUAL_REQUIRED_CALL(_export_project, p_preset, p_debug, p_path, p_flags, ret);
+	GDVIRTUAL_CALL(_export_project, p_preset, p_debug, p_path, p_flags, ret);
 	return ret;
 }
 
@@ -333,7 +333,7 @@ Error EditorExportPlatformExtension::export_zip_patch(const Ref<EditorExportPres
 
 void EditorExportPlatformExtension::get_platform_features(List<String> *r_features) const {
 	Vector<String> ret;
-	if (GDVIRTUAL_REQUIRED_CALL(_get_platform_features, ret) && r_features) {
+	if (GDVIRTUAL_CALL(_get_platform_features, ret) && r_features) {
 		for (const String &E : ret) {
 			r_features->push_back(E);
 		}
diff --git a/editor/export/editor_export_platform_extension.h b/editor/export/editor_export_platform_extension.h
index d1db922698..390aaf4590 100644
--- a/editor/export/editor_export_platform_extension.h
+++ b/editor/export/editor_export_platform_extension.h
@@ -45,7 +45,7 @@ protected:
 
 public:
 	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) const override;
-	GDVIRTUAL1RC(Vector<String>, _get_preset_features, Ref<EditorExportPreset>);
+	GDVIRTUAL1RC_REQUIRED(Vector<String>, _get_preset_features, Ref<EditorExportPreset>);
 
 	virtual bool is_executable(const String &p_path) const override;
 	GDVIRTUAL1RC(bool, _is_executable, const String &);
@@ -63,13 +63,13 @@ public:
 	GDVIRTUAL2RC(String, _get_export_option_warning, Ref<EditorExportPreset>, const StringName &);
 
 	virtual String get_os_name() const override;
-	GDVIRTUAL0RC(String, _get_os_name);
+	GDVIRTUAL0RC_REQUIRED(String, _get_os_name);
 
 	virtual String get_name() const override;
-	GDVIRTUAL0RC(String, _get_name);
+	GDVIRTUAL0RC_REQUIRED(String, _get_name);
 
 	virtual Ref<Texture2D> get_logo() const override;
-	GDVIRTUAL0RC(Ref<Texture2D>, _get_logo);
+	GDVIRTUAL0RC_REQUIRED(Ref<Texture2D>, _get_logo);
 
 	virtual bool poll_export() override;
 	GDVIRTUAL0R(bool, _poll_export);
@@ -119,16 +119,16 @@ public:
 	GDVIRTUAL2RC(bool, _can_export, Ref<EditorExportPreset>, bool);
 
 	virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates, bool p_debug = false) const override;
-	GDVIRTUAL2RC(bool, _has_valid_export_configuration, Ref<EditorExportPreset>, bool);
+	GDVIRTUAL2RC_REQUIRED(bool, _has_valid_export_configuration, Ref<EditorExportPreset>, bool);
 
 	virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const override;
-	GDVIRTUAL1RC(bool, _has_valid_project_configuration, Ref<EditorExportPreset>);
+	GDVIRTUAL1RC_REQUIRED(bool, _has_valid_project_configuration, Ref<EditorExportPreset>);
 
 	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override;
-	GDVIRTUAL1RC(Vector<String>, _get_binary_extensions, Ref<EditorExportPreset>);
+	GDVIRTUAL1RC_REQUIRED(Vector<String>, _get_binary_extensions, Ref<EditorExportPreset>);
 
 	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, BitField<EditorExportPlatform::DebugFlags> p_flags = 0) override;
-	GDVIRTUAL4R(Error, _export_project, Ref<EditorExportPreset>, bool, const String &, BitField<EditorExportPlatform::DebugFlags>);
+	GDVIRTUAL4R_REQUIRED(Error, _export_project, Ref<EditorExportPreset>, bool, const String &, BitField<EditorExportPlatform::DebugFlags>);
 
 	virtual Error export_pack(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, BitField<EditorExportPlatform::DebugFlags> p_flags = 0) override;
 	GDVIRTUAL4R(Error, _export_pack, Ref<EditorExportPreset>, bool, const String &, BitField<EditorExportPlatform::DebugFlags>);
@@ -143,7 +143,7 @@ public:
 	GDVIRTUAL5R(Error, _export_zip_patch, Ref<EditorExportPreset>, bool, const String &, const Vector<String> &, BitField<EditorExportPlatform::DebugFlags>);
 
 	virtual void get_platform_features(List<String> *r_features) const override;
-	GDVIRTUAL0RC(Vector<String>, _get_platform_features);
+	GDVIRTUAL0RC_REQUIRED(Vector<String>, _get_platform_features);
 
 	virtual String get_debug_protocol() const override;
 	GDVIRTUAL0RC(String, _get_debug_protocol);
diff --git a/editor/export/editor_export_plugin.cpp b/editor/export/editor_export_plugin.cpp
index 5945c02413..2f57010c2c 100644
--- a/editor/export/editor_export_plugin.cpp
+++ b/editor/export/editor_export_plugin.cpp
@@ -187,7 +187,7 @@ bool EditorExportPlugin::_begin_customize_resources(const Ref<EditorExportPlatfo
 
 Ref<Resource> EditorExportPlugin::_customize_resource(const Ref<Resource> &p_resource, const String &p_path) {
 	Ref<Resource> ret;
-	GDVIRTUAL_REQUIRED_CALL(_customize_resource, p_resource, p_path, ret);
+	GDVIRTUAL_CALL(_customize_resource, p_resource, p_path, ret);
 	return ret;
 }
 
@@ -199,13 +199,13 @@ bool EditorExportPlugin::_begin_customize_scenes(const Ref<EditorExportPlatform>
 
 Node *EditorExportPlugin::_customize_scene(Node *p_root, const String &p_path) {
 	Node *ret = nullptr;
-	GDVIRTUAL_REQUIRED_CALL(_customize_scene, p_root, p_path, ret);
+	GDVIRTUAL_CALL(_customize_scene, p_root, p_path, ret);
 	return ret;
 }
 
 uint64_t EditorExportPlugin::_get_customization_configuration_hash() const {
 	uint64_t ret = 0;
-	GDVIRTUAL_REQUIRED_CALL(_get_customization_configuration_hash, ret);
+	GDVIRTUAL_CALL(_get_customization_configuration_hash, ret);
 	return ret;
 }
 
@@ -219,7 +219,7 @@ void EditorExportPlugin::_end_customize_resources() {
 
 String EditorExportPlugin::get_name() const {
 	String ret;
-	GDVIRTUAL_REQUIRED_CALL(_get_name, ret);
+	GDVIRTUAL_CALL(_get_name, ret);
 	return ret;
 }
 
diff --git a/editor/export/editor_export_plugin.h b/editor/export/editor_export_plugin.h
index 4c0107af72..8c744b3108 100644
--- a/editor/export/editor_export_plugin.h
+++ b/editor/export/editor_export_plugin.h
@@ -119,11 +119,11 @@ protected:
 	GDVIRTUAL0(_export_end)
 
 	GDVIRTUAL2RC(bool, _begin_customize_resources, const Ref<EditorExportPlatform> &, const Vector<String> &)
-	GDVIRTUAL2R(Ref<Resource>, _customize_resource, const Ref<Resource> &, String)
+	GDVIRTUAL2R_REQUIRED(Ref<Resource>, _customize_resource, const Ref<Resource> &, String)
 
 	GDVIRTUAL2RC(bool, _begin_customize_scenes, const Ref<EditorExportPlatform> &, const Vector<String> &)
-	GDVIRTUAL2R(Node *, _customize_scene, Node *, String)
-	GDVIRTUAL0RC(uint64_t, _get_customization_configuration_hash)
+	GDVIRTUAL2R_REQUIRED(Node *, _customize_scene, Node *, String)
+	GDVIRTUAL0RC_REQUIRED(uint64_t, _get_customization_configuration_hash)
 
 	GDVIRTUAL0(_end_customize_scenes)
 	GDVIRTUAL0(_end_customize_resources)
@@ -134,7 +134,7 @@ protected:
 	GDVIRTUAL1RC(bool, _should_update_export_options, const Ref<EditorExportPlatform> &);
 	GDVIRTUAL2RC(String, _get_export_option_warning, const Ref<EditorExportPlatform> &, String);
 
-	GDVIRTUAL0RC(String, _get_name)
+	GDVIRTUAL0RC_REQUIRED(String, _get_name)
 
 	GDVIRTUAL1RC(bool, _supports_platform, const Ref<EditorExportPlatform> &);