feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
12
engine/thirdparty/tinyexr/patches/0001-external-zlib.patch
vendored
Normal file
12
engine/thirdparty/tinyexr/patches/0001-external-zlib.patch
vendored
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/thirdparty/tinyexr/tinyexr.cc b/thirdparty/tinyexr/tinyexr.cc
|
||||
index fef8f66c98..7bdf827ed3 100644
|
||||
--- a/thirdparty/tinyexr/tinyexr.cc
|
||||
+++ b/thirdparty/tinyexr/tinyexr.cc
|
||||
@@ -4,5 +4,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#include <zlib.h> // Should come before including tinyexr.
|
||||
+
|
||||
#define TINYEXR_IMPLEMENTATION
|
||||
#include "tinyexr.h"
|
||||
2
engine/thirdparty/tinyexr/tinyexr.cc
vendored
2
engine/thirdparty/tinyexr/tinyexr.cc
vendored
|
|
@ -4,9 +4,7 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
// -- GODOT start --
|
||||
#include <zlib.h> // Should come before including tinyexr.
|
||||
// -- GODOT end --
|
||||
|
||||
#define TINYEXR_IMPLEMENTATION
|
||||
#include "tinyexr.h"
|
||||
|
|
|
|||
5
engine/thirdparty/tinyexr/tinyexr.h
vendored
5
engine/thirdparty/tinyexr/tinyexr.h
vendored
|
|
@ -4923,7 +4923,7 @@ static int DecodeTiledLevel(EXRImage* exr_image, const EXRHeader* exr_header,
|
|||
}
|
||||
#endif
|
||||
exr_image->tiles = static_cast<EXRTile*>(
|
||||
calloc(sizeof(EXRTile), static_cast<size_t>(num_tiles)));
|
||||
calloc(static_cast<size_t>(num_tiles), sizeof(EXRTile)));
|
||||
|
||||
#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
|
||||
std::vector<std::thread> workers;
|
||||
|
|
@ -9287,9 +9287,6 @@ int SaveEXR(const float *data, int width, int height, int components,
|
|||
}
|
||||
|
||||
int ret = SaveEXRImageToFile(&image, &header, outfilename, err);
|
||||
if (ret != TINYEXR_SUCCESS) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
free(header.channels);
|
||||
free(header.pixel_types);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue