Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 11:27:51 +0000 (21:27 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 11:27:51 +0000 (21:27 +1000)
intern/clog/clog.c

index d26f054511771d31a5173b2ce2f6a552f0e1ee3b..f725b1c19c40b556ef718832a5fe3a93e58ca31a 100644 (file)
@@ -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