seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.

Browse Source
This commit is contained in:
bruvzg
2022-09-29 12:53:28 +03:00
parent 5b7f62af55
commit 0103af1ddd
240 changed files with 3390 additions and 3431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/noise/noise_texture_2d.cpp
View File

@ -152,24 +152,24 @@ Ref<Image> NoiseTexture2D::_generate_texture() {
return Ref<Image>();
}
Ref<Image> image;
Ref<Image> new_image;
if (seamless) {
image = ref_noise->get_seamless_image(size.x, size.y, invert, in_3d_space, seamless_blend_skirt);
new_image = ref_noise->get_seamless_image(size.x, size.y, invert, in_3d_space, seamless_blend_skirt);
} else {
image = ref_noise->get_image(size.x, size.y, invert, in_3d_space);
new_image = ref_noise->get_image(size.x, size.y, invert, in_3d_space);
}
if (color_ramp.is_valid()) {
image = _modulate_with_gradient(image, color_ramp);
new_image = _modulate_with_gradient(new_image, color_ramp);
}
if (as_normal_map) {
image->bump_map_to_normal_map(bump_strength);
new_image->bump_map_to_normal_map(bump_strength);
}
if (generate_mipmaps) {
image->generate_mipmaps();
new_image->generate_mipmaps();
}
return image;
return new_image;
}
Ref<Image> NoiseTexture2D::_modulate_with_gradient(Ref<Image> p_image, Ref<Gradient> p_gradient) {
@ -206,8 +206,8 @@ void NoiseTexture2D::_update_texture() {
}
} else {
Ref<Image> image = _generate_texture();
_set_texture_image(image);
Ref<Image> new_image = _generate_texture();
_set_texture_image(new_image);
}
update_queued = false;
}