Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -48,8 +48,12 @@
 // Using AZ_Assert for all assert kinds (assert =, CRY_ASSERT, AZ_Assert).
 // see Trace::Assert for implementation
 #if defined(USE_AZ_ASSERT)
-#undef assert
-#define assert(condition) AZ_Assert(condition, "%s", #condition)
+    #undef assert
+    #if !defined(NDEBUG)
+        #define assert(condition) AZ_Assert(condition, "%s", #condition)
+    #else
+        #define assert(condition)
+    #endif
 #endif //defined(USE_AZ_ASSERT)

 //-----------------------------------------------------------------------------------------------------