From 7780926b25567d098c36439d8b12b1c6d4631f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 28 Apr 2023 11:09:12 +0200 Subject: [PATCH] GDScript: Fix template_debug compilation with TOOLS/DEBUG macro mismatch --- modules/gdscript/gdscript.cpp | 4 ++-- modules/noise/noise_texture_3d.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 3bc11c69e9d..d0790aba255 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -741,7 +741,7 @@ Error GDScript::reload(bool p_keep_state) { bool can_run = ScriptServer::is_scripting_enabled() || is_tool(); -#ifdef DEBUG_ENABLED +#ifdef TOOLS_ENABLED if (p_keep_state && can_run && is_valid()) { _save_old_static_data(); } @@ -818,7 +818,7 @@ Error GDScript::reload(bool p_keep_state) { } } -#ifdef DEBUG_ENABLED +#ifdef TOOLS_ENABLED if (can_run && p_keep_state) { _restore_old_static_data(); } diff --git a/modules/noise/noise_texture_3d.cpp b/modules/noise/noise_texture_3d.cpp index ab0f52ffb0b..58403397de2 100644 --- a/modules/noise/noise_texture_3d.cpp +++ b/modules/noise/noise_texture_3d.cpp @@ -156,7 +156,7 @@ TypedArray NoiseTexture3D::_generate_texture() { } } - // Normalize on whole texture at once rather than on each image individualy as it would result in visible artifacts on z (depth) axis. + // Normalize on whole texture at once rather than on each image individually as it would result in visible artifacts on z (depth) axis. if (normalize) { images = _normalize(images); }