-
-
Notifications
You must be signed in to change notification settings - Fork 21.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #75769 from lyuma/msvc_node_debug_fix
Fix libwebp Node struct shadowing Godot's Node class in MSVC debugger
- Loading branch information
Showing
3 changed files
with
23 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters