From 67cfb407129a87901797291dcedec966b8b79a96 Mon Sep 17 00:00:00 2001 From: Steve M Date: Thu, 11 Jul 2024 18:58:04 -0700 Subject: [PATCH] Fix macro and patch --- code/AssetLib/USD/USDPreprocessor.h | 2 +- contrib/tinyusdz/patches/tinyusdz.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/AssetLib/USD/USDPreprocessor.h b/code/AssetLib/USD/USDPreprocessor.h index 11dc79c17..dec37ea27 100644 --- a/code/AssetLib/USD/USDPreprocessor.h +++ b/code/AssetLib/USD/USDPreprocessor.h @@ -45,6 +45,6 @@ Copyright (c) 2006-2024, assimp team #ifndef AI_USDPREPROCESSOR_H_INCLUDED #define AI_USDPREPROCESSOR_H_INCLUDED -#define UNUSED(x) void(x) +#define UNUSED(x) (void) x #endif // AI_USDPREPROCESSOR_H_INCLUDED diff --git a/contrib/tinyusdz/patches/tinyusdz.patch b/contrib/tinyusdz/patches/tinyusdz.patch index 06c6a3b08..e84e9f8fe 100644 --- a/contrib/tinyusdz/patches/tinyusdz.patch +++ b/contrib/tinyusdz/patches/tinyusdz.patch @@ -1,5 +1,5 @@ -diff -rupN -x .git tinyusdz_repo/src/external/stb_image_resize2.h tinyusdz_repo_patch/src/external/stb_image_resize2.h ---- tinyusdz_repo/src/external/stb_image_resize2.h 2024-07-09 21:29:48.556969900 -0700 +diff -rupN -x .git autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h tinyusdz_repo_patch/src/external/stb_image_resize2.h +--- autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h 2024-07-09 21:29:48.556969900 -0700 +++ tinyusdz_repo_patch/src/external/stb_image_resize2.h 2024-07-09 23:03:47.379316700 -0700 @@ -2404,6 +2404,38 @@ static stbir__inline stbir_uint8 stbir__ }