gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-10-03 00:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

GDScript: Fix template_debug compilation with TOOLS/DEBUG macro mismatch

Browse source
This commit is contained in:
Rémi Verschelde 2023-04-28 11:09:12 +02:00
parent 578ca94ef6
commit 7780926b25
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/gdscript/gdscript.cpp
View file

@ -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();
}

2
modules/noise/noise_texture_3d.cpp
View file

@ -156,7 +156,7 @@ TypedArray<Image> 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);
}