blender
/
blender
134
399
Fork 583
Code Issues 6.3k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-04-16 07:39:47 +02:00
parent 55939bf219 b4e8d33f11
commit c1730a03af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/clog/clog.c
View File

@ -29,7 +29,7 @@
#include <assert.h>
/* For 'isatty' to check for color. */
#if defined(__unix__)
#if defined(__unix__) || defined(__APPLE__)
# include <unistd.h>
#endif
@ -454,7 +454,7 @@ static void CLG_ctx_output_set(CLogContext *ctx, void *file_handle)
{
ctx->output_file = file_handle;
ctx->output = fileno(file_handle);
#if defined(__unix__)
#if defined(__unix__) || defined(__APPLE__)
ctx->use_color = isatty(ctx->output);
#endif
}