kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix compilation error without Cycles logging

Browse Source
This commit is contained in:
Sergey Sharybin 2019-06-29 13:54:38 +02:00
parent f021635bd5
commit dd6aff71a7
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/util/util_logging.cpp
View File

@ -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)

2
release/scripts/addons

@ -1 +1 @@
Subproject commit c43da5fa598d590f7d386e1580125ead12cf1678
Subproject commit ae3237c4c5e6ba05c44fad5edd5fcd7e0b34b1a8

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit 5781362d811bb4a99bee4e38a9d3a69813a8dd04
Subproject commit e83541d42c71bfb689acf9a53a6eb66b0c190451

2
source/tools

@ -1 +1 @@
Subproject commit 33d3969202b855305a9823a9bc67a1d56e4546c2
Subproject commit 8598818108ddaf35e30d2a2dbd408ad371e41eb5