Commit: eab03b52388094c7af3fa6fa4e36e325b2bbbfaf
Author: Mateusz Grzeliński
Date: Sat Aug 1 17:46:03 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rBeab03b52388094c7af3fa6fa4e36e325b2bbbfaf
Fix: reverse verbosity comparison
===================================================================
M intern/clog/CLG_log.h
===================================================================
diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h
index dda38552f62..7e2e707ca18 100644
--- a/intern/clog/CLG_log.h
+++ b/intern/clog/CLG_log.h
@@ -220,7 +220,7 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
switch (severity) { \
case CLG_SEVERITY_DEBUG: \
case CLG_SEVERITY_VERBOSE: \
- if (verbose_level < _lg_ty->verbosity_level) { \
+ if (verbose_level > _lg_ty->verbosity_level) { \
break; \
} \
__attribute__((fallthrough)); \
@@ -243,7 +243,7 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
switch (severity) { \
case CLG_SEVERITY_DEBUG: \
case CLG_SEVERITY_VERBOSE: \
- if (verbose_level < _lg_ty->verbosity_level) { \
+ if (verbose_level > _lg_ty->verbosity_level) { \
break; \
} \
__attribute__((fallthrough)); \
@@ -262,7 +262,7 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
switch (severity) { \
case CLG_SEVERITY_DEBUG: \
case CLG_SEVERITY_VERBOSE: \
- if (verbose_level < _lg_ty->verbosity_level) { \
+ if (verbose_level > _lg_ty->verbosity_level) { \
break; \
} \
__attribute__((fallthrough)); \
@@ -294,10 +294,10 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
#define CLOG_FATAL(clg_ref, ...) CLOG_AT_SEVERITY(clg_ref, CLG_SEVERITY_FATAL,
0, __VA_ARGS__)
#ifdef DEBUG
-# define CLOG_STR_DEBUG(clg_ref, level, ...) \
- CLOG_STR_AT_SEVERITY(clg_ref, CLG_SEVERITY_DEBUG, level, __VA_ARGS__)
+# define CLOG_STR_DEBUG(clg_ref, level, str) \
+ CLOG_STR_AT_SEVERITY(clg_ref, CLG_SEVERITY_DEBUG, level, str)
#else
-# define CLOG_STR_DEBUG(clg_ref, level, ...) \
+# define CLOG_STR_DEBUG(clg_ref, level, str) \
do { \
} while (false)
#endif // DEBUG
@@ -310,10 +310,10 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
/* Allocated string which is immediately freed. */
#ifdef DEBUG
-# define CLOG_STR_DEBUG_N(clg_ref, level, ...) \
- CLOG_STR_AT_SEVERITY_N(clg_ref, CLG_SEVERITY_DEBUG, level, __VA_ARGS__)
+# define CLOG_STR_DEBUG_N(clg_ref, level, str) \
+ CLOG_STR_AT_SEVERITY_N(clg_ref, CLG_SEVERITY_DEBUG, level, str)
#else
-# define CLOG_STR_DEBUG_N(clg_ref, level, ...) \
+# define CLOG_STR_DEBUG_N(clg_ref, level, str) \
do { \
} while (false)
#endif // DEBUG
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs