diff --git a/thirdparty/README.md b/thirdparty/README.md index 9862729ea3b..b315d89f4e7 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -364,6 +364,8 @@ Files extracted from upstream source: - `src/` and `sharpyuv/` except from: `.am`, `.rc` and `.in` files - `AUTHORS`, `COPYING`, `PATENTS` +Patch `godot-node-debug-fix.patch` workarounds shadowing of godot's Node class in the MSVC debugger. + ## mbedtls diff --git a/thirdparty/libwebp/godot-node-debug-fix.patch b/thirdparty/libwebp/godot-node-debug-fix.patch new file mode 100644 index 00000000000..848664dccf9 --- /dev/null +++ b/thirdparty/libwebp/godot-node-debug-fix.patch @@ -0,0 +1,16 @@ +diff --git a/thirdparty/libwebp/src/enc/quant_enc.c b/thirdparty/libwebp/src/enc/quant_enc.c +index 6d8202d277..8f9a3c8668 100644 +--- a/src/enc/quant_enc.c ++++ b/src/enc/quant_enc.c +@@ -556,6 +556,11 @@ static void AddScore(VP8ModeScore* WEBP_RESTRICT const dst, + //------------------------------------------------------------------------------ + // Performs trellis-optimized quantization. + ++// -- GODOT start -- ++// Prevents Visual Studio debugger from using this Node struct in place of the Godot Node class. ++#define Node Node_libwebp_quant ++// -- GODOT end -- ++ + // Trellis node + typedef struct { + int8_t prev; // best previous node diff --git a/thirdparty/libwebp/src/enc/quant_enc.c b/thirdparty/libwebp/src/enc/quant_enc.c index 6d8202d2771..8f9a3c86682 100644 --- a/thirdparty/libwebp/src/enc/quant_enc.c +++ b/thirdparty/libwebp/src/enc/quant_enc.c @@ -556,6 +556,11 @@ static void AddScore(VP8ModeScore* WEBP_RESTRICT const dst, //------------------------------------------------------------------------------ // Performs trellis-optimized quantization. +// -- GODOT start -- +// Prevents Visual Studio debugger from using this Node struct in place of the Godot Node class. +#define Node Node_libwebp_quant +// -- GODOT end -- + // Trellis node typedef struct { int8_t prev; // best previous node