diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2014-12-25 17:12:56 +0300 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-12-25 17:12:56 +0300 |
commit | c1f54bcdcca40ef74fac2fa269824f612b4ed8d8 (patch) | |
tree | 7de2a04db49f8f5b22301b7d57bbea08cafb1f4e /source/creator | |
parent | 3e034831de809cf0d65aec9f4d5b445f875dcff2 (diff) |
OSX: revive GHOST_HACK_getFirstFile cause it breaks things on older OSX versions.
Dunno exactly why this was done earlier, but propose not to remove code not understood.
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/creator.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index efef3093730..cc804946f6b 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1001,7 +1001,7 @@ static int render_animation(int UNUSED(argc), const char **UNUSED(argv), void *d BLI_end_threaded_malloc(); } else { - printf("\nError: no blend loaded. cannot use '-a'.\n"); + printf("\nError: no blend loaded. GPG_ghost.cpp use '-a'.\n"); } return 0; } @@ -1551,7 +1551,22 @@ int main( #endif setCallbacks(); + +#if defined(__APPLE__) && !defined(WITH_PYTHON_MODULE) +/* patch to ignore argument finder gives us (pid?) */ + if (argc == 2 && strncmp(argv[1], "-psn_", 5) == 0) { + extern int GHOST_HACK_getFirstFile(char buf[]); + static char firstfilebuf[512]; + + argc = 1; + if (GHOST_HACK_getFirstFile(firstfilebuf)) { + argc = 2; + argv[1] = firstfilebuf; + } + } +#endif + #ifdef __FreeBSD__ fpsetmask(0); #endif |