diff options
| author | 398utubzyt <398utubzyt@gmail.com> | 2024-02-28 05:09:29 -0800 |
|---|---|---|
| committer | 398utubzyt <398utubzyt@gmail.com> | 2024-02-28 05:09:29 -0800 |
| commit | 4c69e8c026b9e2a1cc551e22554bb398ee201674 (patch) | |
| tree | eb7353bccff7a7773183a8c51a4a246d2f89ecbb | |
| parent | df78c0636d79c9545a283e0e2a926d623998cc27 (diff) | |
| download | redot-engine-4c69e8c026b9e2a1cc551e22554bb398ee201674.tar.gz | |
Fix compilation errors when `DISABLE_DEPRECATED` is defined
| -rw-r--r-- | core/object/class_db.cpp | 2 | ||||
| -rw-r--r-- | modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp | 2 | ||||
| -rw-r--r-- | modules/gltf/editor/editor_scene_importer_gltf.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/core/object/class_db.cpp b/core/object/class_db.cpp index 63adc5b502..231a8e4d68 100644 --- a/core/object/class_db.cpp +++ b/core/object/class_db.cpp @@ -599,7 +599,9 @@ ObjectGDExtension *ClassDB::get_placeholder_extension(const StringName &p_class) placeholder_extension->property_can_revert = &PlaceholderExtensionInstance::placeholder_instance_property_can_revert; placeholder_extension->property_get_revert = &PlaceholderExtensionInstance::placeholder_instance_property_get_revert; placeholder_extension->validate_property = &PlaceholderExtensionInstance::placeholder_instance_validate_property; +#ifndef DISABLE_DEPRECATED placeholder_extension->notification = nullptr; +#endif // DISABLE_DEPRECATED placeholder_extension->notification2 = &PlaceholderExtensionInstance::placeholder_instance_notification; placeholder_extension->to_string = &PlaceholderExtensionInstance::placeholder_instance_to_string; placeholder_extension->reference = &PlaceholderExtensionInstance::placeholder_instance_reference; diff --git a/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp b/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp index 3ef54ec0df..b615b5aed8 100644 --- a/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp +++ b/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp @@ -121,7 +121,7 @@ Node *EditorSceneFormatImporterFBX2GLTF::import_scene(const String &p_path, uint bool remove_immutable = p_options.has("animation/remove_immutable_tracks") ? (bool)p_options["animation/remove_immutable_tracks"] : true; return gltf->generate_scene(state, (float)p_options["animation/fps"], trimming, remove_immutable); #else - return gltf->create_scene(state, (float)p_options["animation/fps"], (bool)p_options["animation/trimming"], (bool)p_options["animation/remove_immutable_tracks"]); + return gltf->generate_scene(state, (float)p_options["animation/fps"], (bool)p_options["animation/trimming"], (bool)p_options["animation/remove_immutable_tracks"]); #endif } diff --git a/modules/gltf/editor/editor_scene_importer_gltf.cpp b/modules/gltf/editor/editor_scene_importer_gltf.cpp index 38d7f5521b..78beaac3ed 100644 --- a/modules/gltf/editor/editor_scene_importer_gltf.cpp +++ b/modules/gltf/editor/editor_scene_importer_gltf.cpp @@ -75,7 +75,7 @@ Node *EditorSceneFormatImporterGLTF::import_scene(const String &p_path, uint32_t bool remove_immutable = p_options.has("animation/remove_immutable_tracks") ? (bool)p_options["animation/remove_immutable_tracks"] : true; return gltf->generate_scene(state, (float)p_options["animation/fps"], trimming, remove_immutable); #else - return gltf->create_scene(state, (float)p_options["animation/fps"], (bool)p_options["animation/trimming"], (bool)p_options["animation/remove_immutable_tracks"]); + return gltf->generate_scene(state, (float)p_options["animation/fps"], (bool)p_options["animation/trimming"], (bool)p_options["animation/remove_immutable_tracks"]); #endif } |