From 223aff8b3f73bb786dce5c67b83ff55208d43969 Mon Sep 17 00:00:00 2001 From: Marijn Tamis Date: Mon, 31 Jul 2017 13:52:20 +0200 Subject: NvCloth 1.1.2 Release. (22576033) --- NvCloth/src/Callbacks.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'NvCloth/src/Callbacks.cpp') diff --git a/NvCloth/src/Callbacks.cpp b/NvCloth/src/Callbacks.cpp index 22ba03d..f15a53b 100644 --- a/NvCloth/src/Callbacks.cpp +++ b/NvCloth/src/Callbacks.cpp @@ -54,8 +54,8 @@ static NvClothContext sContext; NV_CLOTH_API(void) InitializeNvCloth(PxAllocatorCallback* allocatorCallback, PxErrorCallback* errorCallback, PxAssertHandler* assertHandler, PxProfilerCallback* profilerCallback, int autoDllIDCheck) { PX_UNUSED(autoDllIDCheck); - NV_CLOTH_ASSERT(("NvCloth dll id mismatch, ensure you compile with matching headers/run with matching dll.", NV_CLOTH_DLL_ID == autoDllIDCheck)); - NV_CLOTH_ASSERT(("NvCloth initialized with invalid allocator", allocatorCallback != nullptr)); + NV_CLOTH_ASSERT_WITH_MESSAGE("NvCloth dll id mismatch, ensure you compile with matching headers/run with matching dll.", NV_CLOTH_DLL_ID == autoDllIDCheck); + NV_CLOTH_ASSERT_WITH_MESSAGE("NvCloth initialized with invalid allocator", allocatorCallback != nullptr); sContext.mAllocator = allocatorCallback; sContext.mErrorCallback = errorCallback; sContext.mAssertHandler = assertHandler; @@ -67,7 +67,7 @@ NV_CLOTH_API(void) InitializeNvCloth(PxAllocatorCallback* allocatorCallback, PxE PxAllocatorCallback* GetNvClothAllocator() { - NV_CLOTH_ASSERT(("NvCloth used before calling InitializeNvCloth", nv::cloth::sContext.mAllocator != nullptr)); + NV_CLOTH_ASSERT_WITH_MESSAGE("NvCloth used before calling InitializeNvCloth", nv::cloth::sContext.mAllocator != nullptr); return nv::cloth::sContext.mAllocator; } -- cgit v1.2.3