diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 14:52:49 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 14:52:49 +0300 |
commit | dc2d841b7c50565302af2986d62ddbd29c332acd (patch) | |
tree | 324f234e56fde77fb80dfdef0c7c21f01968f71b /intern/clog/clog.c | |
parent | 27b28e437d974ebbafa234205941c07aa0ab546c (diff) | |
parent | 4b6fa4d897a0bb3252b16383492b526d2cef3920 (diff) |
Merge branch 'blender2.8' into hair_guideshair_guides
Diffstat (limited to 'intern/clog/clog.c')
-rw-r--r-- | intern/clog/clog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/clog/clog.c b/intern/clog/clog.c index d26f0545117..7ebd3fba425 100644 --- a/intern/clog/clog.c +++ b/intern/clog/clog.c @@ -472,7 +472,7 @@ void CLG_logf( static void CLG_ctx_output_set(CLogContext *ctx, void *file_handle) { ctx->output_file = file_handle; - ctx->output = fileno(file_handle); + ctx->output = fileno(ctx->output_file); #if defined(__unix__) || defined(__APPLE__) ctx->use_color = isatty(ctx->output); #endif @@ -561,7 +561,7 @@ static void CLG_ctx_free(CLogContext *ctx) * \{ */ /* We could support multiple at once, for now this seems not needed. */ -struct CLogContext *g_ctx = NULL; +static struct CLogContext *g_ctx = NULL; void CLG_init(void) { |