godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #87286 from akien-mga/fix-preprocessor-if-ENABLED-checks

Browse Source 
Fix `#if *_ENABLED` inconsistencies, should check if defined
This commit is contained in:
Yuri Sizov
2024-01-17 18:53:33 +01:00
parent e61cae06c6 0a7579b161
commit b6a2c78033
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mono/csharp_script.cpp
View File

@@ -1091,7 +1091,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
}
// The script instance could not be instantiated or wasn't in the list of placeholders to replace.
obj->set_script(scr);
#if DEBUG_ENABLED
#ifdef DEBUG_ENABLED
// If we reached here, the instantiated script must be a placeholder.
CRASH_COND(!obj->get_script_instance()->is_placeholder());
#endif
@@ -2327,7 +2327,7 @@ void CSharpScript::reload_registered_script(Ref<CSharpScript> p_script) {
p_script->_update_exports();
#if TOOLS_ENABLED
#ifdef TOOLS_ENABLED
// If the EditorFileSystem singleton is available, update the file;
// otherwise, the file will be updated when the singleton becomes available.
EditorFileSystem *efs = EditorFileSystem::get_singleton();
@@ -2683,7 +2683,7 @@ Error CSharpScript::reload(bool p_keep_state) {
_update_exports();
#if TOOLS_ENABLED
#ifdef TOOLS_ENABLED
// If the EditorFileSystem singleton is available, update the file;
// otherwise, the file will be updated when the singleton becomes available.
EditorFileSystem *efs = EditorFileSystem::get_singleton();