Merge branch 'blender-v2.81-release'

2019-11-05 14:20:00 +01:00
parent ea7e161e18 7a93abb264
commit 3d5d7cff30
1 changed files with 1 additions and 0 deletions
--- a/intern/cycles/util/util_logging.h
+++ b/intern/cycles/util/util_logging.h
@@ -48,6 +48,7 @@ class LogMessageVoidify {
 #  define LOG_SUPPRESS() (true) ? ((void)0) : LogMessageVoidify() & StubStream()
 #  define LOG(severity) LOG_SUPPRESS()
 #  define VLOG(severity) LOG_SUPPRESS()
+#  define VLOG_IF(severity, condition) LOG_SUPPRESS()
 #endif

 #define VLOG_ONCE(level, flag) \