Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorPatrick Mours <pmours@nvidia.com>2019-11-05 16:20:00 +0300
committerPatrick Mours <pmours@nvidia.com>2019-11-05 16:20:00 +0300
commit3d5d7cff30391fe8473433a4b1fa51c616f758cb (patch)
tree81edbe9adc2b0ed6e7ad5873b3796cd3580f1791 /intern
parentea7e161e189dfd261692eba9ce5587dd2e71c287 (diff)
parent7a93abb2646f3325946c4101b9ec71c58abe1f68 (diff)
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/util/util_logging.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/util/util_logging.h b/intern/cycles/util/util_logging.h
index 1a5e6666b32..3e56f0a0193 100644
--- 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) \