From c75dc29c03e3c94866765b553c9213c63ef9565b Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 17 Jun 2019 16:11:19 -0700 Subject: [PATCH] more assert macro trickery --- libraries/animation/src/AnimClip.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/animation/src/AnimClip.cpp b/libraries/animation/src/AnimClip.cpp index 6aaf07a466..e5edb46f69 100644 --- a/libraries/animation/src/AnimClip.cpp +++ b/libraries/animation/src/AnimClip.cpp @@ -119,7 +119,9 @@ static std::vector buildJointIndexMap(const AnimSkeleton& dstSkeleton, cons *bad_ptr = 0x0badf00d; \ } \ } while (0) -#endif // #ifdef USE_CUSTOM_ASSERT +#else +#define ASSERT assert +#endif void AnimClip::copyFromNetworkAnim() { assert(_networkAnim && _networkAnim->isLoaded() && _skeleton);