[Bf-blender-cvs] [dd6aff71a7c] master: Fix compilation error without Cycles logging

Sergey Sharybin noreply at git.blender.org
Sat Jun 29 13:54:52 CEST 2019


Commit: dd6aff71a7cc9bb3ef617940bb29b90d319854cb
Author: Sergey Sharybin
Date:   Sat Jun 29 13:54:38 2019 +0200
Branches: master
https://developer.blender.org/rBdd6aff71a7cc9bb3ef617940bb29b90d319854cb

Fix compilation error without Cycles logging

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

M	intern/cycles/util/util_logging.cpp
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/tools

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

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
index c43da5fa598..ae3237c4c5e 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit c43da5fa598d590f7d386e1580125ead12cf1678
+Subproject commit ae3237c4c5e6ba05c44fad5edd5fcd7e0b34b1a8
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 5781362d811..e83541d42c7 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 5781362d811bb4a99bee4e38a9d3a69813a8dd04
+Subproject commit e83541d42c71bfb689acf9a53a6eb66b0c190451
diff --git a/source/tools b/source/tools
index 33d3969202b..8598818108d 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 33d3969202b855305a9823a9bc67a1d56e4546c2
+Subproject commit 8598818108ddaf35e30d2a2dbd408ad371e41eb5



More information about the Bf-blender-cvs mailing list