[Bf-blender-cvs] [87c2631b28d] cycles-x: Merge branch 'master' into cycles-x

[Sergey Sharybin]

Commit: 87c2631b28dfe171ab7f43350286f2bc949496d8
Author: Sergey Sharybin
Date:   Thu Jul 29 14:42:06 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB87c2631b28dfe171ab7f43350286f2bc949496d8

Merge branch 'master' into cycles-x

===================================================================



===================================================================

diff --cc intern/cycles/util/util_logging.h
index c8826435afe,c161299acd0..35c2d436d09
--- a/intern/cycles/util/util_logging.h
+++ b/intern/cycles/util/util_logging.h
@@@ -49,7 -49,36 +49,37 @@@ class LogMessageVoidify 
  #  define LOG(severity) LOG_SUPPRESS()
  #  define VLOG(severity) LOG_SUPPRESS()
  #  define VLOG_IF(severity, condition) LOG_SUPPRESS()
 +#  define VLOG_IS_ON(severity) false
+ 
+ #  define CHECK(expression) LOG_SUPPRESS()
+ 
+ #  define CHECK_NOTNULL(expression) LOG_SUPPRESS()
+ #  define CHECK_NULL(expression) LOG_SUPPRESS()
+ 
+ #  define CHECK_NEAR(actual, expected, eps) LOG_SUPPRESS()
+ 
+ #  define CHECK_GE(a, b) LOG_SUPPRESS()
+ #  define CHECK_NE(a, b) LOG_SUPPRESS()
+ #  define CHECK_EQ(a, b) LOG_SUPPRESS()
+ #  define CHECK_GT(a, b) LOG_SUPPRESS()
+ #  define CHECK_LT(a, b) LOG_SUPPRESS()
+ #  define CHECK_LE(a, b) LOG_SUPPRESS()
+ 
+ #  define DCHECK(expression) LOG_SUPPRESS()
+ 
+ #  define DCHECK_NOTNULL(expression) LOG_SUPPRESS()
+ #  define DCHECK_NULL(expression) LOG_SUPPRESS()
+ 
+ #  define DCHECK_NEAR(actual, expected, eps) LOG_SUPPRESS()
+ 
+ #  define DCHECK_GE(a, b) LOG_SUPPRESS()
+ #  define DCHECK_NE(a, b) LOG_SUPPRESS()
+ #  define DCHECK_EQ(a, b) LOG_SUPPRESS()
+ #  define DCHECK_GT(a, b) LOG_SUPPRESS()
+ #  define DCHECK_LT(a, b) LOG_SUPPRESS()
+ #  define DCHECK_LE(a, b) LOG_SUPPRESS()
+ 
+ #  define LOG_ASSERT(expression) LOG_SUPPRESS()
  #endif
  
  #define VLOG_ONCE(level, flag) \