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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-06-29 14:54:38 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-06-29 14:54:38 +0300
commitdd6aff71a7cc9bb3ef617940bb29b90d319854cb (patch)
treed34638df5171603f265f10121ddbff484857d0e8
parentf021635bd5311bff28d44989f2fc14d3e37215a8 (diff)
Fix compilation error without Cycles logging
-rw-r--r--intern/cycles/util/util_logging.cpp6
m---------release/scripts/addons0
m---------release/scripts/addons_contrib0
m---------source/tools0
4 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/util/util_logging.cpp b/intern/cycles/util/util_logging.cpp
index 783a372e59f..cc1e328ba6d 100644
--- a/intern/cycles/util/util_logging.cpp
+++ b/intern/cycles/util/util_logging.cpp
@@ -28,13 +28,17 @@ CCL_NAMESPACE_BEGIN
static bool is_verbosity_set()
{
- using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
+#ifdef WITH_CYCLES_LOGGING
+using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
std::string verbosity;
if (!GetCommandLineOption("v", &verbosity)) {
return false;
}
return verbosity != "0";
+#else
+ return false;
+#endif
}
void util_logging_init(const char *argv0)
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject c43da5fa598d590f7d386e1580125ead12cf167
+Subproject ae3237c4c5e6ba05c44fad5edd5fcd7e0b34b1a
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 5781362d811bb4a99bee4e38a9d3a69813a8dd0
+Subproject e83541d42c71bfb689acf9a53a6eb66b0c19045
diff --git a/source/tools b/source/tools
-Subproject 33d3969202b855305a9823a9bc67a1d56e4546c
+Subproject 8598818108ddaf35e30d2a2dbd408ad371e41eb