Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
This commit is contained in:
parent
5b7f62af55
commit
0103af1ddd
240 changed files with 3390 additions and 3431 deletions
|
|
@ -1288,15 +1288,15 @@ Error CompressedTexture3D::_load_data(const String &p_path, Vector<Ref<Image>> &
|
|||
f->get_32(); // ignored (data format)
|
||||
|
||||
f->get_32(); //ignored
|
||||
int mipmaps = f->get_32();
|
||||
int mipmap_count = f->get_32();
|
||||
f->get_32(); //ignored
|
||||
f->get_32(); //ignored
|
||||
|
||||
r_mipmaps = mipmaps != 0;
|
||||
r_mipmaps = mipmap_count != 0;
|
||||
|
||||
r_data.clear();
|
||||
|
||||
for (int i = 0; i < (r_depth + mipmaps); i++) {
|
||||
for (int i = 0; i < (r_depth + mipmap_count); i++) {
|
||||
Ref<Image> image = CompressedTexture2D::load_image_from_file(f, 0);
|
||||
ERR_FAIL_COND_V(image.is_null() || image->is_empty(), ERR_CANT_OPEN);
|
||||
if (i == 0) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue