Merge branch 'blender-v4.0-release'

2023-09-28 14:26:54 +10:00
parent 046ae0c790 d4f1a9b0ad
commit dd07944bcf
1 changed files with 3 additions and 1 deletions
--- a/intern/guardedalloc/intern/mallocn_guarded_impl.c
+++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c
@@ -47,7 +47,9 @@
 * twice, once here, and once by LSAN.
 */
 #if defined(_MSC_VER)
-#  define DEBUG_BACKTRACE
+#  ifdef WITH_ASAN
+#    define DEBUG_BACKTRACE
+#  endif
 #else
 /* Un-comment to report back-traces with leaks, uses ASAN when enabled.
 * NOTE: The default linking options cause the stack traces only to include addresses.