diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:10:42 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:10:42 +0300 |
| commit | 58d6cbba6da31db8dc8a2b42d528b9a353081904 (patch) | |
| tree | 04b57a2f809c6f08d84a082edf061f3ece631860 /intern/cycles/app/cycles_server.cpp | |
| parent | 94549adec4b6857fb6ec4cf77606da51ff7c26b7 (diff) | |
| parent | 295d0c52a26730edc6d4ed1276e4051cce006be5 (diff) | |
Merge branch 'master' into temp-ghash-setopstemp-ghash-setops
Diffstat (limited to 'intern/cycles/app/cycles_server.cpp')
| -rw-r--r-- | intern/cycles/app/cycles_server.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp index 3d5b237eec1..4ef9cd070bb 100644 --- a/intern/cycles/app/cycles_server.cpp +++ b/intern/cycles/app/cycles_server.cpp @@ -24,6 +24,7 @@ #include "util_stats.h" #include "util_string.h" #include "util_task.h" +#include "util_logging.h" using namespace ccl; @@ -66,7 +67,7 @@ int main(int argc, const char **argv) exit(EXIT_FAILURE); } - if (debug) { + if(debug) { util_logging_start(); util_logging_verbosity_set(verbosity); } |