Fix build error on Windows 32 bit.
[blender-staging.git] / source / creator / creator.c
index e2d7bda3a216bb46164098bc09bdca5e9f0b0f24..a59a45f885c8685f5838c4d74f070f310f2011ef 100644 (file)
  *  \ingroup creator
  */
 
-
-#if defined(__linux__) && defined(__GNUC__)
-#  define _GNU_SOURCE
-#  include <fenv.h>
-#endif
-
-#if (defined(__APPLE__) && (defined(__i386__) || defined(__x86_64__)))
-#  define OSX_SSE_FPE
-#  include <xmmintrin.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef WIN32
-#  if defined(_MSC_VER) && _MSC_VER >= 1800 && defined(_M_X64)
+#  if defined(_MSC_VER) && defined(_M_X64)
 #    include <math.h> /* needed for _set_FMA3_enable */
 #  endif
 #  include <windows.h>
 #  include "utfconv.h"
 #endif
 
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <errno.h>
-#include <time.h>
-
-/* This little block needed for linking to Blender... */
-
 #include "MEM_guardedalloc.h"
 
-#ifdef WIN32
-#  include "BLI_winstuff.h"
-#endif
+#include "DNA_genfile.h"
 
 #include "BLI_args.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 #include "BLI_callbacks.h"
-#include "BLI_blenlib.h"
-#include "BLI_mempool.h"
-#include "BLI_system.h"
-#include BLI_SYSTEM_PID_H
-
-#include "DNA_ID.h"
-#include "DNA_scene_types.h"
-#include "DNA_userdef_types.h"
+#include "BLI_string.h"
 
+/* mostly init functions */
 #include "BKE_appdir.h"
 #include "BKE_blender.h"
 #include "BKE_brush.h"
+#include "BKE_cachefile.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h" /* for DAG_on_visible_update */
+#include "BKE_depsgraph.h" /* for DAG_init */
 #include "BKE_font.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_modifier.h"
-#include "BKE_scene.h"
 #include "BKE_node.h"
-#include "BKE_report.h"
 #include "BKE_sound.h"
 #include "BKE_image.h"
 #include "BKE_particle.h"
 
-#include "DEG_depsgraph.h"
-
-#include "IMB_imbuf.h"  /* for IMB_init */
-
-#ifdef WITH_PYTHON
-#include "BPY_extern.h"
-#endif
-
-#include "RE_engine.h"
-#include "RE_pipeline.h"
-#include "RE_render_ext.h"
-
-#include "ED_datafiles.h"
-#include "ED_util.h"
-
-#include "WM_api.h"
-
-#include "RNA_define.h"
-
-#include "GPU_draw.h"
-#include "GPU_extensions.h"
-
-#ifdef WITH_FREESTYLE
-#  include "FRS_freestyle.h"
-#endif
-
-#ifdef WITH_BUILDINFO_HEADER
-#  define BUILD_DATE
-#endif
-
-/* for passing information between creator and gameengine */
-#ifdef WITH_GAMEENGINE
-#  include "BL_System.h"
-#else /* dummy */
-#  define SYS_SystemHandle int
-#endif
-
-#include <signal.h>
-
-#ifdef __FreeBSD__
-#  include <sys/types.h>
-#  include <floatingpoint.h>
-#  include <sys/rtprio.h>
-#endif
-
-#ifdef WITH_BINRELOC
-#  include "binreloc.h"
-#endif
-
-#ifdef WITH_LIBMV
-#  include "libmv-capi.h"
-#endif
-
-#ifdef WITH_CYCLES_LOGGING
-#  include "CCL_api.h"
-#endif
-
-#ifdef WITH_SDL_DYNLOAD
-#  include "sdlew.h"
-#endif
-
-/* from buildinfo.c */
-#ifdef BUILD_DATE
-extern char build_date[];
-extern char build_time[];
-extern char build_hash[];
-extern unsigned long build_commit_timestamp;
-
-/* TODO(sergey): ideally size need to be in sync with buildinfo.c */
-extern char build_commit_date[16];
-extern char build_commit_time[16];
-
-extern char build_branch[];
-extern char build_platform[];
-extern char build_type[];
-extern char build_cflags[];
-extern char build_cxxflags[];
-extern char build_linkflags[];
-extern char build_system[];
-#endif
-
-/*     Local Function prototypes */
-#ifdef WITH_PYTHON_MODULE
-int  main_python_enter(int argc, const char **argv);
-void main_python_exit(void);
-#else
-static int print_help(int argc, const char **argv, void *data);
-static int print_version(int argc, const char **argv, void *data);
-#endif
-
-/* for the callbacks: */
-#ifndef WITH_PYTHON_MODULE
-#define BLEND_VERSION_FMT         "Blender %d.%02d (sub %d)"
-#define BLEND_VERSION_ARG         BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION
-/* pass directly to printf */
-#define BLEND_VERSION_STRING_FMT  BLEND_VERSION_FMT "\n", BLEND_VERSION_ARG
-#endif
-
-/* Initialize callbacks for the modules that need them */
-static void setCallbacks(void); 
-
-#ifndef WITH_PYTHON_MODULE
-
-static bool use_crash_handler = true;
-static bool use_abort_handler = true;
-
-/* set breakpoints here when running in debug mode, useful to catch floating point errors */
-#if defined(__linux__) || defined(_WIN32) || defined(OSX_SSE_FPE)
-static void fpe_handler(int UNUSED(sig))
-{
-       fprintf(stderr, "debug: SIGFPE trapped\n");
-}
-#endif
-
-/* handling ctrl-c event in console */
-#if !(defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS))
-static void blender_esc(int sig)
-{
-       static int count = 0;
-       
-       G.is_break = true;  /* forces render loop to read queue, not sure if its needed */
-       
-       if (sig == 2) {
-               if (count) {
-                       printf("\nBlender killed\n");
-                       exit(2);
-               }
-               printf("\nSent an internal break event. Press ^C again to kill Blender\n");
-               count++;
-       }
-}
-#endif
-
-static int print_version(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       printf(BLEND_VERSION_STRING_FMT);
-#ifdef BUILD_DATE
-       printf("\tbuild date: %s\n", build_date);
-       printf("\tbuild time: %s\n", build_time);
-       printf("\tbuild commit date: %s\n", build_commit_date);
-       printf("\tbuild commit time: %s\n", build_commit_time);
-       printf("\tbuild hash: %s\n", build_hash);
-       printf("\tbuild platform: %s\n", build_platform);
-       printf("\tbuild type: %s\n", build_type);
-       printf("\tbuild c flags: %s\n", build_cflags);
-       printf("\tbuild c++ flags: %s\n", build_cxxflags);
-       printf("\tbuild link flags: %s\n", build_linkflags);
-       printf("\tbuild system: %s\n", build_system);
-#endif
-       exit(0);
-
-       return 0;
-}
-
-static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data)
-{
-       bArgs *ba = (bArgs *)data;
-
-       printf(BLEND_VERSION_STRING_FMT);
-       printf("Usage: blender [args ...] [file] [args ...]\n\n");
-
-       printf("Render Options:\n");
-       BLI_argsPrintArgDoc(ba, "--background");
-       BLI_argsPrintArgDoc(ba, "--render-anim");
-       BLI_argsPrintArgDoc(ba, "--scene");
-       BLI_argsPrintArgDoc(ba, "--render-frame");
-       BLI_argsPrintArgDoc(ba, "--frame-start");
-       BLI_argsPrintArgDoc(ba, "--frame-end");
-       BLI_argsPrintArgDoc(ba, "--frame-jump");
-       BLI_argsPrintArgDoc(ba, "--render-output");
-       BLI_argsPrintArgDoc(ba, "--engine");
-       BLI_argsPrintArgDoc(ba, "--threads");
-       
-       printf("\n");
-       printf("Format Options:\n");
-       BLI_argsPrintArgDoc(ba, "--render-format");
-       BLI_argsPrintArgDoc(ba, "--use-extension");
-
-       printf("\n");
-       printf("Animation Playback Options:\n");
-       BLI_argsPrintArgDoc(ba, "-a");
-                               
-       printf("\n");
-       printf("Window Options:\n");
-       BLI_argsPrintArgDoc(ba, "--window-border");
-       BLI_argsPrintArgDoc(ba, "--window-borderless");
-       BLI_argsPrintArgDoc(ba, "--window-geometry");
-       BLI_argsPrintArgDoc(ba, "--start-console");
-       BLI_argsPrintArgDoc(ba, "--no-native-pixels");
-
-
-       printf("\n");
-       printf("Game Engine Specific Options:\n");
-       BLI_argsPrintArgDoc(ba, "-g");
-
-       printf("\n");
-       printf("Python Options:\n");
-       BLI_argsPrintArgDoc(ba, "--enable-autoexec");
-       BLI_argsPrintArgDoc(ba, "--disable-autoexec");
-
-       printf("\n");
-
-       BLI_argsPrintArgDoc(ba, "--python");
-       BLI_argsPrintArgDoc(ba, "--python-text");
-       BLI_argsPrintArgDoc(ba, "--python-console");
-       BLI_argsPrintArgDoc(ba, "--addons");
-
-
-       printf("\n");
-       printf("Debug Options:\n");
-       BLI_argsPrintArgDoc(ba, "--debug");
-       BLI_argsPrintArgDoc(ba, "--debug-value");
-
-       printf("\n");
-       BLI_argsPrintArgDoc(ba, "--debug-events");
-#ifdef WITH_FFMPEG
-       BLI_argsPrintArgDoc(ba, "--debug-ffmpeg");
-#endif
-       BLI_argsPrintArgDoc(ba, "--debug-handlers");
-#ifdef WITH_LIBMV
-       BLI_argsPrintArgDoc(ba, "--debug-libmv");
-#endif
-#ifdef WITH_CYCLES_LOGGING
-       BLI_argsPrintArgDoc(ba, "--debug-cycles");
-#endif
-       BLI_argsPrintArgDoc(ba, "--debug-memory");
-       BLI_argsPrintArgDoc(ba, "--debug-jobs");
-       BLI_argsPrintArgDoc(ba, "--debug-python");
-       BLI_argsPrintArgDoc(ba, "--debug-depsgraph");
-
-       BLI_argsPrintArgDoc(ba, "--debug-wm");
-       BLI_argsPrintArgDoc(ba, "--debug-all");
-
-       printf("\n");
-       BLI_argsPrintArgDoc(ba, "--debug-fpe");
-       BLI_argsPrintArgDoc(ba, "--disable-crash-handler");
-
-       printf("\n");
-       printf("Misc Options:\n");
-       BLI_argsPrintArgDoc(ba, "--factory-startup");
-       printf("\n");
-       BLI_argsPrintArgDoc(ba, "--env-system-config");
-       BLI_argsPrintArgDoc(ba, "--env-system-datafiles");
-       BLI_argsPrintArgDoc(ba, "--env-system-scripts");
-       BLI_argsPrintArgDoc(ba, "--env-system-python");
-       printf("\n");
-       BLI_argsPrintArgDoc(ba, "-nojoystick");
-       BLI_argsPrintArgDoc(ba, "-noglsl");
-       BLI_argsPrintArgDoc(ba, "-noaudio");
-       BLI_argsPrintArgDoc(ba, "-setaudio");
-
-       printf("\n");
-
-       BLI_argsPrintArgDoc(ba, "--help");
-
-#ifdef WIN32
-       BLI_argsPrintArgDoc(ba, "-R");
-       BLI_argsPrintArgDoc(ba, "-r");
-#endif
-       BLI_argsPrintArgDoc(ba, "--version");
-
-       BLI_argsPrintArgDoc(ba, "--");
-
-       printf("Other Options:\n");
-       BLI_argsPrintOtherDoc(ba);
-
-       printf("\n");
-       printf("Experimental features:\n");
-       BLI_argsPrintArgDoc(ba, "--enable-new-depsgraph");
-
-       printf("Argument Parsing:\n");
-       printf("\targuments must be separated by white space. eg\n");
-       printf("\t\t\"blender -ba test.blend\"\n");
-       printf("\t...will ignore the 'a'\n");
-       printf("\t\t\"blender -b test.blend -f8\"\n");
-       printf("\t...will ignore 8 because there is no space between the -f and the frame value\n\n");
-
-       printf("Argument Order:\n");
-       printf("\targuments are executed in the order they are given. eg\n");
-       printf("\t\t\"blender --background test.blend --render-frame 1 --render-output /tmp\"\n");
-       printf("\t...will not render to /tmp because '--render-frame 1' renders before the output path is set\n");
-       printf("\t\t\"blender --background --render-output /tmp test.blend --render-frame 1\"\n");
-       printf("\t...will not render to /tmp because loading the blend file overwrites the render output that was set\n");
-       printf("\t\t\"blender --background test.blend --render-output /tmp --render-frame 1\" works as expected.\n\n");
-
-       printf("\nEnvironment Variables:\n");
-       printf("  $BLENDER_USER_CONFIG      Directory for user configuration files.\n");
-       printf("  $BLENDER_USER_SCRIPTS     Directory for user scripts.\n");
-       printf("  $BLENDER_SYSTEM_SCRIPTS   Directory for system wide scripts.\n");
-       printf("  $BLENDER_USER_DATAFILES   Directory for user data files (icons, translations, ..).\n");
-       printf("  $BLENDER_SYSTEM_DATAFILES Directory for system wide data files.\n");
-       printf("  $BLENDER_SYSTEM_PYTHON    Directory for system python libraries.\n");
-#ifdef WIN32
-       printf("  $TEMP                     Store temporary files here.\n");
-#else
-       printf("  $TMP or $TMPDIR           Store temporary files here.\n");
-#endif
-#ifdef WITH_SDL
-       printf("  $SDL_AUDIODRIVER          LibSDL audio driver - alsa, esd, dma.\n");
-#endif
-       printf("  $PYTHONHOME               Path to the python directory, eg. /usr/lib/python.\n\n");
-
-       exit(0);
-
-       return 0;
-}
-
-static int end_arguments(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       return -1;
-}
-
-static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       G.f |= G_SCRIPT_AUTOEXEC;
-       G.f |= G_SCRIPT_OVERRIDE_PREF;
-       return 0;
-}
-
-static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       G.f &= ~G_SCRIPT_AUTOEXEC;
-       G.f |= G_SCRIPT_OVERRIDE_PREF;
-       return 0;
-}
-
-static int disable_crash_handler(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       use_crash_handler = false;
-       return 0;
-}
-
-static int disable_abort_handler(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       use_abort_handler = false;
-       return 0;
-}
-
-static int background_mode(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       G.background = 1;
-       return 0;
-}
-
-static int debug_mode(int UNUSED(argc), const char **UNUSED(argv), void *data)
-{
-       G.debug |= G_DEBUG;  /* std output printf's */
-       printf(BLEND_VERSION_STRING_FMT);
-       MEM_set_memory_debug();
-#ifdef DEBUG
-       BLI_mempool_set_memory_debug();
-#endif
-
-#ifdef WITH_BUILDINFO
-       printf("Build: %s %s %s %s\n", build_date, build_time, build_platform, build_type);
-#endif
-
-       BLI_argsPrint(data);
-       return 0;
-}
-
-static int debug_mode_generic(int UNUSED(argc), const char **UNUSED(argv), void *data)
-{
-       G.debug |= GET_INT_FROM_POINTER(data);
-       return 0;
-}
-
-#ifdef WITH_LIBMV
-static int debug_mode_libmv(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       libmv_startDebugLogging();
-
-       return 0;
-}
-#endif
-
-#ifdef WITH_CYCLES_LOGGING
-static int debug_mode_cycles(int UNUSED(argc), const char **UNUSED(argv),
-                             void *UNUSED(data))
-{
-       CCL_start_debug_logging();
-       return 0;
-}
-#endif
-
-static int debug_mode_memory(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       MEM_set_memory_debug();
-       return 0;
-}
-
-static int set_debug_value(int argc, const char **argv, void *UNUSED(data))
-{
-       if (argc > 1) {
-               G.debug_value = atoi(argv[1]);
-
-               return 1;
-       }
-       else {
-               printf("\nError: you must specify debug value to set.\n");
-               return 0;
-       }
-}
-
-static int set_fpe(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-#if defined(__linux__) || defined(_WIN32) || defined(OSX_SSE_FPE)
-       /* zealous but makes float issues a heck of a lot easier to find!
-        * set breakpoints on fpe_handler */
-       signal(SIGFPE, fpe_handler);
-
-# if defined(__linux__) && defined(__GNUC__)
-       feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
-# endif /* defined(__linux__) && defined(__GNUC__) */
-# if defined(OSX_SSE_FPE)
-       /* OSX uses SSE for floating point by default, so here 
-        * use SSE instructions to throw floating point exceptions */
-       _MM_SET_EXCEPTION_MASK(_MM_MASK_MASK & ~
-                              (_MM_MASK_OVERFLOW | _MM_MASK_INVALID | _MM_MASK_DIV_ZERO));
-# endif /* OSX_SSE_FPE */
-# if defined(_WIN32) && defined(_MSC_VER)
-       _controlfp_s(NULL, 0, _MCW_EM); /* enables all fp exceptions */
-       _controlfp_s(NULL, _EM_DENORMAL | _EM_UNDERFLOW | _EM_INEXACT, _MCW_EM); /* hide the ones we don't care about */
-# endif /* _WIN32 && _MSC_VER */
-#endif
-
-       return 0;
-}
-
-static void blender_crash_handler_backtrace(FILE *fp)
-{
-       fputs("\n# backtrace\n", fp);
-       BLI_system_backtrace(fp);
-}
-
-static void blender_crash_handler(int signum)
-{
-
-#if 0
-       {
-               char fname[FILE_MAX];
-
-               if (!G.main->name[0]) {
-                       BLI_make_file_string("/", fname, BKE_tempdir_base(), "crash.blend");
-               }
-               else {
-                       BLI_strncpy(fname, G.main->name, sizeof(fname));
-                       BLI_replace_extension(fname, sizeof(fname), ".crash.blend");
-               }
-
-               printf("Writing: %s\n", fname);
-               fflush(stdout);
-
-               BKE_undo_save_file(fname);
-       }
-#endif
-
-       FILE *fp;
-       char header[512];
-       wmWindowManager *wm = G.main->wm.first;
-
-       char fname[FILE_MAX];
-
-       if (!G.main->name[0]) {
-               BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), "blender.crash.txt");
-       }
-       else {
-               BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), BLI_path_basename(G.main->name));
-               BLI_replace_extension(fname, sizeof(fname), ".crash.txt");
-       }
-
-       printf("Writing: %s\n", fname);
-       fflush(stdout);
-
-#ifndef BUILD_DATE
-       BLI_snprintf(header, sizeof(header), "# " BLEND_VERSION_FMT ", Unknown revision\n", BLEND_VERSION_ARG);
-#else
-       BLI_snprintf(header, sizeof(header), "# " BLEND_VERSION_FMT ", Commit date: %s %s, Hash %s\n",
-                    BLEND_VERSION_ARG, build_commit_date, build_commit_time, build_hash);
-#endif
-
-       /* open the crash log */
-       errno = 0;
-       fp = BLI_fopen(fname, "wb");
-       if (fp == NULL) {
-               fprintf(stderr, "Unable to save '%s': %s\n",
-                       fname, errno ? strerror(errno) : "Unknown error opening file");
-       }
-       else {
-               if (wm) {
-                       BKE_report_write_file_fp(fp, &wm->reports, header);
-               }
-
-               blender_crash_handler_backtrace(fp);
-
-               fclose(fp);
-       }
-
-       /* Delete content of temp dir! */
-       BKE_tempdir_session_purge();
-
-       /* really crash */
-       signal(signum, SIG_DFL);
-#ifndef WIN32
-       kill(getpid(), signum);
-#else
-       TerminateProcess(GetCurrentProcess(), signum);
-#endif
-}
-
-#ifdef WIN32
-LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo)
-{
-       switch (ExceptionInfo->ExceptionRecord->ExceptionCode) {
-               case EXCEPTION_ACCESS_VIOLATION:
-                       fputs("Error: EXCEPTION_ACCESS_VIOLATION\n", stderr);
-                       break;
-               case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-                       fputs("Error: EXCEPTION_ARRAY_BOUNDS_EXCEEDED\n", stderr);
-                       break;
-               case EXCEPTION_BREAKPOINT:
-                       fputs("Error: EXCEPTION_BREAKPOINT\n", stderr);
-                       break;
-               case EXCEPTION_DATATYPE_MISALIGNMENT:
-                       fputs("Error: EXCEPTION_DATATYPE_MISALIGNMENT\n", stderr);
-                       break;
-               case EXCEPTION_FLT_DENORMAL_OPERAND:
-                       fputs("Error: EXCEPTION_FLT_DENORMAL_OPERAND\n", stderr);
-                       break;
-               case EXCEPTION_FLT_DIVIDE_BY_ZERO:
-                       fputs("Error: EXCEPTION_FLT_DIVIDE_BY_ZERO\n", stderr);
-                       break;
-               case EXCEPTION_FLT_INEXACT_RESULT:
-                       fputs("Error: EXCEPTION_FLT_INEXACT_RESULT\n", stderr);
-                       break;
-               case EXCEPTION_FLT_INVALID_OPERATION:
-                       fputs("Error: EXCEPTION_FLT_INVALID_OPERATION\n", stderr);
-                       break;
-               case EXCEPTION_FLT_OVERFLOW:
-                       fputs("Error: EXCEPTION_FLT_OVERFLOW\n", stderr);
-                       break;
-               case EXCEPTION_FLT_STACK_CHECK:
-                       fputs("Error: EXCEPTION_FLT_STACK_CHECK\n", stderr);
-                       break;
-               case EXCEPTION_FLT_UNDERFLOW:
-                       fputs("Error: EXCEPTION_FLT_UNDERFLOW\n", stderr);
-                       break;
-               case EXCEPTION_ILLEGAL_INSTRUCTION:
-                       fputs("Error: EXCEPTION_ILLEGAL_INSTRUCTION\n", stderr);
-                       break;
-               case EXCEPTION_IN_PAGE_ERROR:
-                       fputs("Error: EXCEPTION_IN_PAGE_ERROR\n", stderr);
-                       break;
-               case EXCEPTION_INT_DIVIDE_BY_ZERO:
-                       fputs("Error: EXCEPTION_INT_DIVIDE_BY_ZERO\n", stderr);
-                       break;
-               case EXCEPTION_INT_OVERFLOW:
-                       fputs("Error: EXCEPTION_INT_OVERFLOW\n", stderr);
-                       break;
-               case EXCEPTION_INVALID_DISPOSITION:
-                       fputs("Error: EXCEPTION_INVALID_DISPOSITION\n", stderr);
-                       break;
-               case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-                       fputs("Error: EXCEPTION_NONCONTINUABLE_EXCEPTION\n", stderr);
-                       break;
-               case EXCEPTION_PRIV_INSTRUCTION:
-                       fputs("Error: EXCEPTION_PRIV_INSTRUCTION\n", stderr);
-                       break;
-               case EXCEPTION_SINGLE_STEP:
-                       fputs("Error: EXCEPTION_SINGLE_STEP\n", stderr);
-                       break;
-               case EXCEPTION_STACK_OVERFLOW:
-                       fputs("Error: EXCEPTION_STACK_OVERFLOW\n", stderr);
-                       break;
-               default:
-                       fputs("Error: Unrecognized Exception\n", stderr);
-                       break;
-       }
-
-       fflush(stderr);
-
-       /* If this is a stack overflow then we can't walk the stack, so just show
-        * where the error happened */
-       if (EXCEPTION_STACK_OVERFLOW != ExceptionInfo->ExceptionRecord->ExceptionCode) {
-               blender_crash_handler(SIGSEGV);
-       }
-
-       return EXCEPTION_EXECUTE_HANDLER;
-}
-#endif
-
-
-static void blender_abort_handler(int UNUSED(signum))
-{
-       /* Delete content of temp dir! */
-       BKE_tempdir_session_purge();
-}
-
-static int set_factory_startup(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       G.factory_startup = 1;
-       return 0;
-}
-
-static int set_env(int argc, const char **argv, void *UNUSED(data))
-{
-       /* "--env-system-scripts" --> "BLENDER_SYSTEM_SCRIPTS" */
-
-       char env[64] = "BLENDER";
-       char *ch_dst = env + 7; /* skip BLENDER */
-       const char *ch_src = argv[0] + 5; /* skip --env */
-
-       if (argc < 2) {
-               printf("%s requires one argument\n", argv[0]);
-               exit(1);
-       }
-
-       for (; *ch_src; ch_src++, ch_dst++) {
-               *ch_dst = (*ch_src == '-') ? '_' : (*ch_src) - 32; /* toupper() */
-       }
-
-       *ch_dst = '\0';
-       BLI_setenv(env, argv[1]);
-       return 1;
-}
-
-static int playback_mode(int argc, const char **argv, void *UNUSED(data))
-{
-       /* not if -b was given first */
-       if (G.background == 0) {
-#ifdef WITH_FFMPEG
-               /* Setup FFmpeg with current debug flags. */
-               IMB_ffmpeg_init();
-#endif
-
-               WM_main_playanim(argc, argv); /* not the same argc and argv as before */
-               exit(0); /* 2.4x didn't do this */
-       }
-
-       return -2;
-}
-
-static int prefsize(int argc, const char **argv, void *UNUSED(data))
-{
-       int stax, stay, sizx, sizy;
-
-       if (argc < 5) {
-               fprintf(stderr, "-p requires four arguments\n");
-               exit(1);
-       }
-
-       stax = atoi(argv[1]);
-       stay = atoi(argv[2]);
-       sizx = atoi(argv[3]);
-       sizy = atoi(argv[4]);
-
-       WM_init_state_size_set(stax, stay, sizx, sizy);
-
-       return 4;
-}
-
-static int native_pixels(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       WM_init_native_pixels(false);
-       return 0;
-}
-
-static int with_borders(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       WM_init_state_normal_set();
-       return 0;
-}
-
-static int without_borders(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       WM_init_state_fullscreen_set();
-       return 0;
-}
-
-extern bool wm_start_with_console; /* wm_init_exit.c */
-static int start_with_console(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       wm_start_with_console = true;
-       return 0;
-}
-
-static int register_extension(int UNUSED(argc), const char **UNUSED(argv), void *data)
-{
-#ifdef WIN32
-       if (data)
-               G.background = 1;
-       RegisterBlendExtension();
-#else
-       (void)data; /* unused */
-#endif
-       return 0;
-}
-
-static int no_joystick(int UNUSED(argc), const char **UNUSED(argv), void *data)
-{
-#ifndef WITH_GAMEENGINE
-       (void)data;
-#else
-       SYS_SystemHandle *syshandle = data;
-
-       /**
-        * don't initialize joysticks if user doesn't want to use joysticks
-        * failed joystick initialization delays over 5 seconds, before game engine start
-        */
-       SYS_WriteCommandLineInt(*syshandle, "nojoystick", 1);
-       if (G.debug & G_DEBUG) printf("disabling nojoystick\n");
-#endif
-
-       return 0;
-}
-
-static int no_glsl(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       GPU_extensions_disable();
-       return 0;
-}
-
-static int no_audio(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       BKE_sound_force_device(0);
-       return 0;
-}
-
-static int set_audio(int argc, const char **argv, void *UNUSED(data))
-{
-       if (argc < 1) {
-               fprintf(stderr, "-setaudio require one argument\n");
-               exit(1);
-       }
-
-       BKE_sound_force_device(BKE_sound_define_from_str(argv[1]));
-       return 1;
-}
-
-static int set_output(int argc, const char **argv, void *data)
-{
-       bContext *C = data;
-       if (argc > 1) {
-               Scene *scene = CTX_data_scene(C);
-               if (scene) {
-                       BLI_strncpy(scene->r.pic, argv[1], sizeof(scene->r.pic));
-               }
-               else {
-                       printf("\nError: no blend loaded. cannot use '-o / --render-output'.\n");
-               }
-               return 1;
-       }
-       else {
-               printf("\nError: you must specify a path after '-o  / --render-output'.\n");
-               return 0;
-       }
-}
-
-static int set_engine(int argc, const char **argv, void *data)
-{
-       bContext *C = data;
-       if (argc >= 2) {
-               if (STREQ(argv[1], "help")) {
-                       RenderEngineType *type = NULL;
-                       printf("Blender Engine Listing:\n");
-                       for (type = R_engines.first; type; type = type->next) {
-                               printf("\t%s\n", type->idname);
-                       }
-                       exit(0);
-               }
-               else {
-                       Scene *scene = CTX_data_scene(C);
-                       if (scene) {
-                               RenderData *rd = &scene->r;
-
-                               if (BLI_findstring(&R_engines, argv[1], offsetof(RenderEngineType, idname))) {
-                                       BLI_strncpy_utf8(rd->engine, argv[1], sizeof(rd->engine));
-                               }
-                               else {
-                                       printf("\nError: engine not found '%s'\n", argv[1]);
-                                       exit(1);
-                               }
-                       }
-                       else {
-                               printf("\nError: no blend loaded. order the arguments so '-E  / --engine ' is after a blend is loaded.\n");
-                       }
-               }
-
-               return 1;
-       }
-       else {
-               printf("\nEngine not specified, give 'help' for a list of available engines.\n");
-               return 0;
-       }
-}
 
-static int set_image_type(int argc, const char **argv, void *data)
-{
-       bContext *C = data;
-       if (argc > 1) {
-               const char *imtype = argv[1];
-               Scene *scene = CTX_data_scene(C);
-               if (scene) {
-                       const char imtype_new = BKE_imtype_from_arg(imtype);
-
-                       if (imtype_new == R_IMF_IMTYPE_INVALID) {
-                               printf("\nError: Format from '-F / --render-format' not known or not compiled in this release.\n");
-                       }
-                       else {
-                               scene->r.im_format.imtype = imtype_new;
-                       }
-               }
-               else {
-                       printf("\nError: no blend loaded. order the arguments so '-F  / --render-format' is after the blend is loaded.\n");
-               }
-               return 1;
-       }
-       else {
-               printf("\nError: you must specify a format after '-F  / --render-foramt'.\n");
-               return 0;
-       }
-}
+#include "IMB_imbuf.h"  /* for IMB_init */
 
-static int set_threads(int argc, const char **argv, void *UNUSED(data))
-{
-       if (argc > 1) {
-               int threads = atoi(argv[1]);
+#include "RE_engine.h"
+#include "RE_render_ext.h"
 
-               if (threads >= 0 && threads <= BLENDER_MAX_THREADS) {
-                       BLI_system_num_threads_override_set(threads);
-               }
-               else {
-                       printf("Error, threads has to be in range 0-%d\n", BLENDER_MAX_THREADS);
-               }
-               return 1;
-       }
-       else {
-               printf("\nError: you must specify a number of threads between 0 and %d '-t / --threads'.\n", BLENDER_MAX_THREADS);
-               return 0;
-       }
-}
+#include "ED_datafiles.h"
 
-static int depsgraph_use_new(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-       DEG_depsgraph_switch_to_new();
-       return 0;
-}
+#include "WM_api.h"
 
-static int set_verbosity(int argc, const char **argv, void *UNUSED(data))
-{
-       if (argc > 1) {
-               int level = atoi(argv[1]);
+#include "RNA_define.h"
 
-#ifdef WITH_LIBMV
-               libmv_setLoggingVerbosity(level);
-#elif defined(WITH_CYCLES_LOGGING)
-               CCL_logging_verbosity_set(level);
-#else
-               (void)level;
+#ifdef WITH_FREESTYLE
+#  include "FRS_freestyle.h"
 #endif
 
-               return 1;
-       }
-       else {
-               printf("\nError: you must specify a verbosity level.\n");
-               return 0;
-       }
-}
-
-static int set_extension(int argc, const char **argv, void *data)
-{
-       bContext *C = data;
-       if (argc > 1) {
-               Scene *scene = CTX_data_scene(C);
-               if (scene) {
-                       if (argv[1][0] == '0') {
-                               scene->r.scemode &= ~R_EXTENSION;
-                       }
-                       else if (argv[1][0] == '1') {
-                               scene->r.scemode |= R_EXTENSION;
-                       }
-                       else {
-                               printf("\nError: Use '-x 1 / -x 0' To set the extension option or '--use-extension'\n");
-                       }
-               }
-               else {
-                       printf("\nError: no blend loaded. order the arguments so '-o ' is after '-x '.\n");
-               }
-               return 1;
-       }
-       else {
-               printf("\nError: you must specify a path after '- '.\n");
-               return 0;
-       }
-}
-
-static int set_ge_parameters(int argc, const char **argv, void *data)
-{
-       int a = 0;
+/* for passing information between creator and gameengine */
 #ifdef WITH_GAMEENGINE
-       SYS_SystemHandle syshandle = *(SYS_SystemHandle *)data;
-#else
-       (void)data;
+#  include "BL_System.h"
+#else /* dummy */
+#  define SYS_SystemHandle int
 #endif
 
-       /**
-        * gameengine parameters are automatically put into system
-        * -g [paramname = value]
-        * -g [boolparamname]
-        * example:
-        * -g novertexarrays
-        * -g maxvertexarraysize = 512
-        */
+#include <signal.h>
 
-       if (argc >= 1) {
-               const char *paramname = argv[a];
-               /* check for single value versus assignment */
-               if (a + 1 < argc && (*(argv[a + 1]) == '=')) {
-                       a++;
-                       if (a + 1 < argc) {
-                               a++;
-                               /* assignment */
-#ifdef WITH_GAMEENGINE
-                               SYS_WriteCommandLineString(syshandle, paramname, argv[a]);
+#ifdef __FreeBSD__
+#  include <floatingpoint.h>
 #endif
-                       }
-                       else {
-                               printf("error: argument assignment (%s) without value.\n", paramname);
-                               return 0;
-                       }
-                       /* name arg eaten */
 
-               }
-               else {
-#ifdef WITH_GAMEENGINE
-                       SYS_WriteCommandLineInt(syshandle, argv[a], 1);
+#ifdef WITH_BINRELOC
+#  include "binreloc.h"
 #endif
-                       /* doMipMap */
-                       if (STREQ(argv[a], "nomipmap")) {
-                               GPU_set_mipmap(0); //doMipMap = 0;
-                       }
-                       /* linearMipMap */
-                       if (STREQ(argv[a], "linearmipmap")) {
-                               GPU_set_mipmap(1);
-                               GPU_set_linear_mipmap(1); //linearMipMap = 1;
-                       }
 
+#ifdef WITH_LIBMV
+#  include "libmv-capi.h"
+#endif
 
-               } /* if (*(argv[a + 1]) == '=') */
-       }
+#ifdef WITH_CYCLES_LOGGING
+#  include "CCL_api.h"
+#endif
 
-       return a;
-}
+#ifdef WITH_SDL_DYNLOAD
+#  include "sdlew.h"
+#endif
 
-static int render_frame(int argc, const char **argv, void *data)
-{
-       bContext *C = data;
-       Scene *scene = CTX_data_scene(C);
-       if (scene) {
-               Main *bmain = CTX_data_main(C);
-
-               if (argc > 1) {
-                       Render *re = RE_NewRender(scene->id.name);
-                       int frame;
-                       ReportList reports;
-
-                       switch (*argv[1]) {
-                               case '+':
-                                       frame = scene->r.sfra + atoi(argv[1] + 1);
-                                       break;
-                               case '-':
-                                       frame = (scene->r.efra - atoi(argv[1] + 1)) + 1;
-                                       break;
-                               default:
-                                       frame = atoi(argv[1]);
-                                       break;
-                       }
+#include "creator_intern.h"  /* own include */
 
-                       BLI_begin_threaded_malloc();
-                       BKE_reports_init(&reports, RPT_PRINT);
 
-                       frame = CLAMPIS(frame, MINAFRAME, MAXFRAME);
+/*     Local Function prototypes */
+#ifdef WITH_PYTHON_MODULE
+int  main_python_enter(int argc, const char **argv);
+void main_python_exit(void);
+#endif
 
-                       RE_SetReports(re, &reports);
-                       RE_BlenderAnim(re, bmain, scene, NULL, scene->lay, frame, frame, scene->r.frame_step);
-                       RE_SetReports(re, NULL);
-                       BLI_end_threaded_malloc();
-                       return 1;
-               }
-               else {
-                       printf("\nError: frame number must follow '-f / --render-frame'.\n");
-                       return 0;
-               }
-       }
-       else {
-               printf("\nError: no blend loaded. cannot use '-f / --render-frame'.\n");
-               return 0;
+/* written to by 'creator_args.c' */
+struct ApplicationState app_state = {
+       .signal = {
+               .use_crash_handler = true,
+               .use_abort_handler = true,
+       },
+       .exit_code_on_error = {
+               .python = 0,
        }
-}
+};
 
-static int render_animation(int UNUSED(argc), const char **UNUSED(argv), void *data)
-{
-       bContext *C = data;
-       Scene *scene = CTX_data_scene(C);
-       if (scene) {
-               Main *bmain = CTX_data_main(C);
-               Render *re = RE_NewRender(scene->id.name);
-               ReportList reports;
-               BLI_begin_threaded_malloc();
-               BKE_reports_init(&reports, RPT_PRINT);
-               RE_SetReports(re, &reports);
-               RE_BlenderAnim(re, bmain, scene, NULL, scene->lay, scene->r.sfra, scene->r.efra, scene->r.frame_step);
-               RE_SetReports(re, NULL);
-               BLI_end_threaded_malloc();
-       }
-       else {
-               printf("\nError: no blend loaded. cannot use '-a'.\n");
-       }
-       return 0;
-}
+/* -------------------------------------------------------------------- */
 
-static int set_scene(int argc, const char **argv, void *data)
-{
-       if (argc > 1) {
-               bContext *C = data;
-               Scene *scene = BKE_scene_set_name(CTX_data_main(C), argv[1]);
-               if (scene) {
-                       CTX_data_scene_set(C, scene);
-               }
-               return 1;
-       }
-       else {
-               printf("\nError: Scene name must follow '-S / --scene'.\n");
-               return 0;
-       }
-}
+/** \name Application Level Callbacks
+ *
+ * Initialize callbacks for the modules that need them.
+ *
+ * \{ */
 
-static int set_start_frame(int argc, const char **argv, void *data)
+static void callback_mem_error(const char *errorStr)
 {
-       bContext *C = data;
-       Scene *scene = CTX_data_scene(C);
-       if (scene) {
-               if (argc > 1) {
-                       int frame = atoi(argv[1]);
-                       (scene->r.sfra) = CLAMPIS(frame, MINFRAME, MAXFRAME);
-                       return 1;
-               }
-               else {
-                       printf("\nError: frame number must follow '-s / --frame-start'.\n");
-                       return 0;
-               }
-       }
-       else {
-               printf("\nError: no blend loaded. cannot use '-s / --frame-start'.\n");
-               return 0;
-       }
+       fputs(errorStr, stderr);
+       fflush(stderr);
 }
 
-static int set_end_frame(int argc, const char **argv, void *data)
+static void main_callback_setup(void)
 {
-       bContext *C = data;
-       Scene *scene = CTX_data_scene(C);
-       if (scene) {
-               if (argc > 1) {
-                       int frame = atoi(argv[1]);
-                       (scene->r.efra) = CLAMPIS(frame, MINFRAME, MAXFRAME);
-                       return 1;
-               }
-               else {
-                       printf("\nError: frame number must follow '-e / --frame-end'.\n");
-                       return 0;
-               }
-       }
-       else {
-               printf("\nError: no blend loaded. cannot use '-e / --frame-end'.\n");
-               return 0;
-       }
+       /* Error output from the alloc routines: */
+       MEM_set_error_callback(callback_mem_error);
 }
 
-static int set_skip_frame(int argc, const char **argv, void *data)
-{
-       bContext *C = data;
-       Scene *scene = CTX_data_scene(C);
-       if (scene) {
-               if (argc > 1) {
-                       int frame = atoi(argv[1]);
-                       (scene->r.frame_step) = CLAMPIS(frame, 1, MAXFRAME);
-                       return 1;
-               }
-               else {
-                       printf("\nError: number of frames to step must follow '-j / --frame-jump'.\n");
-                       return 0;
-               }
-       }
-       else {
-               printf("\nError: no blend loaded. cannot use '-j / --frame-jump'.\n");
-               return 0;
-       }
-}
+/* free data on early exit (if Python calls 'sys.exit()' while parsing args for eg). */
+struct CreatorAtExitData {
+       bArgs *ba;
+#ifdef WIN32
+       const char **argv;
+       int argv_num;
+#endif
+};
 
-/* macro for ugly context setup/reset */
-#ifdef WITH_PYTHON
-#define BPY_CTX_SETUP(_cmd)                                                   \
-       {                                                                         \
-               wmWindowManager *wm = CTX_wm_manager(C);                              \
-               Scene *scene_prev = CTX_data_scene(C);                                \
-               wmWindow *win_prev;                                                   \
-               const bool has_win = !BLI_listbase_is_empty(&wm->windows);            \
-               if (has_win) {                                                        \
-                       win_prev = CTX_wm_window(C);                                      \
-                       CTX_wm_window_set(C, wm->windows.first);                          \
-               }                                                                     \
-               else {                                                                \
-                       fprintf(stderr, "Python script \"%s\" "                           \
-                               "running with missing context data.\n", argv[1]);         \
-               }                                                                     \
-               {                                                                     \
-                       _cmd;                                                             \
-               }                                                                     \
-               if (has_win) {                                                        \
-                       CTX_wm_window_set(C, win_prev);                                   \
-               }                                                                     \
-               CTX_data_scene_set(C, scene_prev);                                    \
-       } (void)0                                                                 \
-
-#endif /* WITH_PYTHON */
-
-static int run_python_file(int argc, const char **argv, void *data)
+static void callback_main_atexit(void *user_data)
 {
-#ifdef WITH_PYTHON
-       bContext *C = data;
-
-       /* workaround for scripts not getting a bpy.context.scene, causes internal errors elsewhere */
-       if (argc > 1) {
-               /* Make the path absolute because its needed for relative linked blends to be found */
-               char filename[FILE_MAX];
-               BLI_strncpy(filename, argv[1], sizeof(filename));
-               BLI_path_cwd(filename);
+       struct CreatorAtExitData *app_init_data = user_data;
 
-               BPY_CTX_SETUP(BPY_filepath_exec(C, filename, NULL));
-
-               return 1;
-       }
-       else {
-               printf("\nError: you must specify a filepath after '%s'.\n", argv[0]);
-               return 0;
+       if (app_init_data->ba) {
+               BLI_argsFree(app_init_data->ba);
+               app_init_data->ba = NULL;
        }
-#else
-       UNUSED_VARS(argc, argv, data);
-       printf("This blender was built without python support\n");
-       return 0;
-#endif /* WITH_PYTHON */
-}
 
-static int run_python_text(int argc, const char **argv, void *data)
-{
-#ifdef WITH_PYTHON
-       bContext *C = data;
-
-       /* workaround for scripts not getting a bpy.context.scene, causes internal errors elsewhere */
-       if (argc > 1) {
-               /* Make the path absolute because its needed for relative linked blends to be found */
-               struct Text *text = (struct Text *)BKE_libblock_find_name(ID_TXT, argv[1]);
-
-               if (text) {
-                       BPY_CTX_SETUP(BPY_text_exec(C, text, NULL, false));
-                       return 1;
-               }
-               else {
-                       printf("\nError: text block not found %s.\n", argv[1]);
-                       return 1;
+#ifdef WIN32
+       if (app_init_data->argv) {
+               while (app_init_data->argv_num) {
+                       free((void *)app_init_data->argv[--app_init_data->argv_num]);
                }
+               free((void *)app_init_data->argv);
+               app_init_data->argv = NULL;
        }
-       else {
-               printf("\nError: you must specify a text block after '%s'.\n", argv[0]);
-               return 0;
-       }
-#else
-       UNUSED_VARS(argc, argv, data);
-       printf("This blender was built without python support\n");
-       return 0;
-#endif /* WITH_PYTHON */
-}
-
-static int run_python_console(int UNUSED(argc), const char **argv, void *data)
-{
-#ifdef WITH_PYTHON
-       bContext *C = data;
-
-       BPY_CTX_SETUP(BPY_string_exec(C, "__import__('code').interact()"));
-
-       return 0;
-#else
-       UNUSED_VARS(argv, data);
-       printf("This blender was built without python support\n");
-       return 0;
-#endif /* WITH_PYTHON */
-}
-
-static int set_addons(int argc, const char **argv, void *data)
-{
-       /* workaround for scripts not getting a bpy.context.scene, causes internal errors elsewhere */
-       if (argc > 1) {
-#ifdef WITH_PYTHON
-               const int slen = strlen(argv[1]) + 128;
-               char *str = malloc(slen);
-               bContext *C = data;
-               BLI_snprintf(str, slen, "[__import__('addon_utils').enable(i, default_set=False) for i in '%s'.split(',')]", argv[1]);
-               BPY_CTX_SETUP(BPY_string_exec(C, str));
-               free(str);
-#else
-               UNUSED_VARS(argv, data);
-#endif /* WITH_PYTHON */
-               return 1;
-       }
-       else {
-               printf("\nError: you must specify a comma separated list after '--addons'.\n");
-               return 0;
-       }
-}
-
-static int load_file(int UNUSED(argc), const char **argv, void *data)
-{
-       bContext *C = data;
-
-       /* Make the path absolute because its needed for relative linked blends to be found */
-       char filename[FILE_MAX];
-
-       /* note, we could skip these, but so far we always tried to load these files */
-       if (argv[0][0] == '-') {
-               fprintf(stderr, "unknown argument, loading as file: %s\n", argv[0]);
-       }
-
-       BLI_strncpy(filename, argv[0], sizeof(filename));
-       BLI_path_cwd(filename);
-
-       if (G.background) {
-               int retval;
-
-               BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_PRE);
-
-               retval = BKE_read_file(C, filename, NULL);
-
-               /* we successfully loaded a blend file, get sure that
-                * pointcache works */
-               if (retval != BKE_READ_FILE_FAIL) {
-                       wmWindowManager *wm = CTX_wm_manager(C);
-                       Main *bmain = CTX_data_main(C);
-
-                       /* special case, 2.4x files */
-                       if (wm == NULL && BLI_listbase_is_empty(&bmain->wm)) {
-                               extern void wm_add_default(bContext *C);
-
-                               /* wm_add_default() needs the screen to be set. */
-                               CTX_wm_screen_set(C, bmain->screen.first);
-                               wm_add_default(C);
-                       }
-
-                       CTX_wm_manager_set(C, NULL); /* remove wm to force check */
-                       WM_check(C);
-                       if (bmain->name[0]) {
-                               G.save_over = 1;
-                               G.relbase_valid = 1;
-                       }
-                       else {
-                               G.save_over = 0;
-                               G.relbase_valid = 0;
-                       }
-                       if (CTX_wm_manager(C) == NULL) CTX_wm_manager_set(C, wm);  /* reset wm */
-
-                       /* WM_file_read would call normally */
-                       ED_editors_init(C);
-                       DAG_on_visible_update(bmain, true);
-                       BKE_scene_update_tagged(bmain->eval_ctx, bmain, CTX_data_scene(C));
-               }
-               else {
-                       /* failed to load file, stop processing arguments */
-                       return -1;
-               }
-
-               /* WM_file_read() runs normally but since we're in background mode do here */
-#ifdef WITH_PYTHON
-               /* run any texts that were loaded in and flagged as modules */
-               BPY_python_reset(C);
 #endif
-
-               BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);
-
-               /* happens for the UI on file reading too (huh? (ton))*/
-               // XXX          BKE_undo_reset();
-               //                      BKE_undo_write("original");     /* save current state */
-       }
-       else {
-               /* we are not running in background mode here, but start blender in UI mode with
-                * a file - this should do everything a 'load file' does */
-               ReportList reports;
-               BKE_reports_init(&reports, RPT_PRINT);
-               WM_file_autoexec_init(filename);
-               WM_file_read(C, filename, &reports);
-               BKE_reports_clear(&reports);
-       }
-
-       G.file_loaded = 1;
-
-       return 0;
 }
 
-static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
-{
-       static char output_doc[] = "<path>"
-               "\n\tSet the render path and file name."
-               "\n\tUse // at the start of the path to"
-               "\n\t\trender relative to the blend file."
-               "\n\tThe # characters are replaced by the frame number, and used to define zero padding."
-               "\n\t\tani_##_test.png becomes ani_01_test.png"
-               "\n\t\ttest-######.png becomes test-000001.png"
-               "\n\t\tWhen the filename does not contain #, The suffix #### is added to the filename"
-               "\n\tThe frame number will be added at the end of the filename."
-               "\n\t\teg: blender -b foobar.blend -o //render_ -F PNG -x 1 -a"
-               "\n\t\t//render_ becomes //render_####, writing frames as //render_0001.png//";
-
-       static char format_doc[] = "<format>"
-               "\n\tSet the render format, Valid options are..."
-               "\n\t\tTGA IRIS JPEG MOVIE IRIZ RAWTGA"
-               "\n\t\tAVIRAW AVIJPEG PNG BMP FRAMESERVER"
-               "\n\t(formats that can be compiled into blender, not available on all systems)"
-               "\n\t\tHDR TIFF EXR MULTILAYER MPEG AVICODEC QUICKTIME CINEON DPX DDS";
-
-       static char playback_doc[] = "<options> <file(s)>"
-               "\n\tPlayback <file(s)>, only operates this way when not running in background."
-               "\n\t\t-p <sx> <sy>\tOpen with lower left corner at <sx>, <sy>"
-               "\n\t\t-m\t\tRead from disk (Don't buffer)"
-               "\n\t\t-f <fps> <fps-base>\t\tSpecify FPS to start with"
-               "\n\t\t-j <frame>\tSet frame step to <frame>"
-               "\n\t\t-s <frame>\tPlay from <frame>"
-               "\n\t\t-e <frame>\tPlay until <frame>";
-
-       static char game_doc[] = "Game Engine specific options"
-               "\n\t-g fixedtime\t\tRun on 50 hertz without dropping frames"
-               "\n\t-g vertexarrays\t\tUse Vertex Arrays for rendering (usually faster)"
-               "\n\t-g nomipmap\t\tNo Texture Mipmapping"
-               "\n\t-g linearmipmap\t\tLinear Texture Mipmapping instead of Nearest (default)";
-
-       static char debug_doc[] = "\n\tTurn debugging on\n"
-               "\n\t* Prints every operator call and their arguments"
-               "\n\t* Disables mouse grab (to interact with a debugger in some cases)"
-               "\n\t* Keeps python sys.stdin rather than setting it to None";
-
-       //BLI_argsAdd(ba, pass, short_arg, long_arg, doc, cb, C);
-
-       /* end argument processing after -- */
-       BLI_argsAdd(ba, -1, "--", NULL, "\n\tEnds option processing, following arguments passed unchanged. Access via python's sys.argv", end_arguments, NULL);
-
-       /* first pass: background mode, disable python and commands that exit after usage */
-       BLI_argsAdd(ba, 1, "-h", "--help", "\n\tPrint this help text and exit", print_help, ba);
-       /* Windows only */
-       BLI_argsAdd(ba, 1, "/?", NULL, "\n\tPrint this help text and exit (windows only)", print_help, ba);
-
-       BLI_argsAdd(ba, 1, "-v", "--version", "\n\tPrint Blender version and exit", print_version, NULL);
-       
-       /* only to give help message */
-#ifndef WITH_PYTHON_SECURITY /* default */
-#  define   PY_ENABLE_AUTO ", (default)"
-#  define   PY_DISABLE_AUTO ""
-#else
-#  define   PY_ENABLE_AUTO ""
-#  define   PY_DISABLE_AUTO ", (compiled as non-standard default)"
-#endif
-
-       BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL);
-       BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers & startup scripts)" PY_DISABLE_AUTO, disable_python, NULL);
-
-       BLI_argsAdd(ba, 1, NULL, "--disable-crash-handler", "\n\tDisable the crash handler", disable_crash_handler, NULL);
-       BLI_argsAdd(ba, 1, NULL, "--disable-abort-handler", "\n\tDisable the abort handler", disable_abort_handler, NULL);
-
-#undef PY_ENABLE_AUTO
-#undef PY_DISABLE_AUTO
-       
-       BLI_argsAdd(ba, 1, "-b", "--background", "\n\tRun in background (often used for UI-less rendering)", background_mode, NULL);
-
-       BLI_argsAdd(ba, 1, "-a", NULL, playback_doc, playback_mode, NULL);
-
-       BLI_argsAdd(ba, 1, "-d", "--debug", debug_doc, debug_mode, ba);
-
-#ifdef WITH_FFMPEG
-       BLI_argsAdd(ba, 1, NULL, "--debug-ffmpeg", "\n\tEnable debug messages from FFmpeg library", debug_mode_generic, (void *)G_DEBUG_FFMPEG);
-#endif
-
-#ifdef WITH_FREESTYLE
-       BLI_argsAdd(ba, 1, NULL, "--debug-freestyle", "\n\tEnable debug/profiling messages from Freestyle rendering", debug_mode_generic, (void *)G_DEBUG_FREESTYLE);
-#endif
+/** \} */
 
-       BLI_argsAdd(ba, 1, NULL, "--debug-python", "\n\tEnable debug messages for python", debug_mode_generic, (void *)G_DEBUG_PYTHON);
-       BLI_argsAdd(ba, 1, NULL, "--debug-events", "\n\tEnable debug messages for the event system", debug_mode_generic, (void *)G_DEBUG_EVENTS);
-       BLI_argsAdd(ba, 1, NULL, "--debug-handlers", "\n\tEnable debug messages for event handling", debug_mode_generic, (void *)G_DEBUG_HANDLERS);
-       BLI_argsAdd(ba, 1, NULL, "--debug-wm",     "\n\tEnable debug messages for the window manager", debug_mode_generic, (void *)G_DEBUG_WM);
-       BLI_argsAdd(ba, 1, NULL, "--debug-all",    "\n\tEnable all debug messages (excludes libmv)", debug_mode_generic, (void *)G_DEBUG_ALL);
 
-       BLI_argsAdd(ba, 1, NULL, "--debug-fpe", "\n\tEnable floating point exceptions", set_fpe, NULL);
 
-#ifdef WITH_LIBMV
-       BLI_argsAdd(ba, 1, NULL, "--debug-libmv", "\n\tEnable debug messages from libmv library", debug_mode_libmv, NULL);
-#endif
-#ifdef WITH_CYCLES_LOGGING
-       BLI_argsAdd(ba, 1, NULL, "--debug-cycles", "\n\tEnable debug messages from Cycles", debug_mode_cycles, NULL);
-#endif
-       BLI_argsAdd(ba, 1, NULL, "--debug-memory", "\n\tEnable fully guarded memory allocation and debugging", debug_mode_memory, NULL);
-
-       BLI_argsAdd(ba, 1, NULL, "--debug-value", "<value>\n\tSet debug value of <value> on startup\n", set_debug_value, NULL);
-       BLI_argsAdd(ba, 1, NULL, "--debug-jobs",  "\n\tEnable time profiling for background jobs.", debug_mode_generic, (void *)G_DEBUG_JOBS);
-       BLI_argsAdd(ba, 1, NULL, "--debug-depsgraph", "\n\tEnable debug messages from dependency graph", debug_mode_generic, (void *)G_DEBUG_DEPSGRAPH);
-       BLI_argsAdd(ba, 1, NULL, "--debug-gpumem", "\n\tEnable GPU memory stats in status bar", debug_mode_generic, (void *)G_DEBUG_GPU_MEM);
-
-       BLI_argsAdd(ba, 1, NULL, "--enable-new-depsgraph", "\n\tUse new dependency graph", depsgraph_use_new, NULL);
-
-       BLI_argsAdd(ba, 1, NULL, "--verbose", "<verbose>\n\tSet logging verbosity level.", set_verbosity, NULL);
-
-       BLI_argsAdd(ba, 1, NULL, "--factory-startup", "\n\tSkip reading the "STRINGIFY (BLENDER_STARTUP_FILE)" in the users home directory", set_factory_startup, NULL);
-
-       /* TODO, add user env vars? */
-       BLI_argsAdd(ba, 1, NULL, "--env-system-datafiles",  "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_DATAFILES)" environment variable", set_env, NULL);
-       BLI_argsAdd(ba, 1, NULL, "--env-system-scripts",    "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_SCRIPTS)" environment variable", set_env, NULL);
-       BLI_argsAdd(ba, 1, NULL, "--env-system-python",     "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_PYTHON)" environment variable", set_env, NULL);
-
-       /* second pass: custom window stuff */
-       BLI_argsAdd(ba, 2, "-p", "--window-geometry", "<sx> <sy> <w> <h>\n\tOpen with lower left corner at <sx>, <sy> and width and height as <w>, <h>", prefsize, NULL);
-       BLI_argsAdd(ba, 2, "-w", "--window-border", "\n\tForce opening with borders (default)", with_borders, NULL);
-       BLI_argsAdd(ba, 2, "-W", "--window-borderless", "\n\tForce opening without borders", without_borders, NULL);
-       BLI_argsAdd(ba, 2, "-con", "--start-console", "\n\tStart with the console window open (ignored if -b is set), (Windows only)", start_with_console, NULL);
-       BLI_argsAdd(ba, 2, "-R", NULL, "\n\tRegister .blend extension, then exit (Windows only)", register_extension, NULL);
-       BLI_argsAdd(ba, 2, "-r", NULL, "\n\tSilently register .blend extension, then exit (Windows only)", register_extension, ba);
-       BLI_argsAdd(ba, 2, NULL, "--no-native-pixels", "\n\tDo not use native pixel size, for high resolution displays (MacBook 'Retina')", native_pixels, ba);
-
-       /* third pass: disabling things and forcing settings */
-       BLI_argsAddCase(ba, 3, "-nojoystick", 1, NULL, 0, "\n\tDisable joystick support", no_joystick, syshandle);
-       BLI_argsAddCase(ba, 3, "-noglsl", 1, NULL, 0, "\n\tDisable GLSL shading", no_glsl, NULL);
-       BLI_argsAddCase(ba, 3, "-noaudio", 1, NULL, 0, "\n\tForce sound system to None", no_audio, NULL);
-       BLI_argsAddCase(ba, 3, "-setaudio", 1, NULL, 0, "\n\tForce sound system to a specific device\n\tNULL SDL OPENAL JACK", set_audio, NULL);
-
-       /* fourth pass: processing arguments */
-       BLI_argsAdd(ba, 4, "-g", NULL, game_doc, set_ge_parameters, syshandle);
-       BLI_argsAdd(ba, 4, "-f", "--render-frame", "<frame>\n\tRender frame <frame> and save it.\n\t+<frame> start frame relative, -<frame> end frame relative.", render_frame, C);
-       BLI_argsAdd(ba, 4, "-a", "--render-anim", "\n\tRender frames from start to end (inclusive)", render_animation, C);
-       BLI_argsAdd(ba, 4, "-S", "--scene", "<name>\n\tSet the active scene <name> for rendering", set_scene, C);
-       BLI_argsAdd(ba, 4, "-s", "--frame-start", "<frame>\n\tSet start to frame <frame> (use before the -a argument)", set_start_frame, C);
-       BLI_argsAdd(ba, 4, "-e", "--frame-end", "<frame>\n\tSet end to frame <frame> (use before the -a argument)", set_end_frame, C);
-       BLI_argsAdd(ba, 4, "-j", "--frame-jump", "<frames>\n\tSet number of frames to step forward after each rendered frame", set_skip_frame, C);
-       BLI_argsAdd(ba, 4, "-P", "--python", "<filename>\n\tRun the given Python script file", run_python_file, C);
-       BLI_argsAdd(ba, 4, NULL, "--python-text", "<name>\n\tRun the given Python script text block", run_python_text, C);
-       BLI_argsAdd(ba, 4, NULL, "--python-console", "\n\tRun blender with an interactive console", run_python_console, C);
-       BLI_argsAdd(ba, 4, NULL, "--addons", "\n\tComma separated list of addons (no spaces)", set_addons, C);
-
-       BLI_argsAdd(ba, 4, "-o", "--render-output", output_doc, set_output, C);
-       BLI_argsAdd(ba, 4, "-E", "--engine", "<engine>\n\tSpecify the render engine\n\tuse -E help to list available engines", set_engine, C);
-
-       BLI_argsAdd(ba, 4, "-F", "--render-format", format_doc, set_image_type, C);
-       BLI_argsAdd(ba, 4, "-t", "--threads", "<threads>\n\tUse amount of <threads> for rendering and other operations\n\t[1-" STRINGIFY(BLENDER_MAX_THREADS) "], 0 for systems processor count.", set_threads, NULL);
-       BLI_argsAdd(ba, 4, "-x", "--use-extension", "<bool>\n\tSet option to add the file extension to the end of the file", set_extension, C);
+/* -------------------------------------------------------------------- */
 
-}
-#endif /* WITH_PYTHON_MODULE */
+/** \name Main Function
+ * \{ */
 
 #ifdef WITH_PYTHON_MODULE
 /* allow python module to call main */
@@ -1568,11 +202,11 @@ char **environ = NULL;
 #endif
 
 /**
- * Blender's main function responsabilities are:
+ * Blender's main function responsibilities are:
  * - setup subsystems.
  * - handle arguments.
- * - run WM_main() event loop,
- *   or exit when running in background mode.
+ * - run #WM_main() event loop,
+ *   or exit immediately when running in background mode.
  */
 int main(
         int argc,
@@ -1597,10 +231,18 @@ int main(
 
        /* --- end declarations --- */
 
+       /* ensure we free data on early-exit */
+       struct CreatorAtExitData app_init_data = {NULL};
+       BKE_blender_atexit_register(callback_main_atexit, &app_init_data);
 
 #ifdef WIN32
+       /* We delay loading of openmp so we can set the policy here. */
+# if defined(_MSC_VER)
+       _putenv_s("OMP_WAIT_POLICY", "PASSIVE");
+# endif
+
        /* FMA3 support in the 2013 CRT is broken on Vista and Windows 7 RTM (fixed in SP1). Just disable it. */
-#  if defined(_MSC_VER) && _MSC_VER >= 1800 && defined(_M_X64)
+#  if defined(_MSC_VER) && defined(_M_X64)
        _set_FMA3_enable(0);
 #  endif
 
@@ -1615,6 +257,10 @@ int main(
                        argv[argv_num] = alloc_utf_8_from_16(argv_16[argv_num], 0);
                }
                LocalFree(argv_16);
+
+               /* free on early-exit */
+               app_init_data.argv = argv;
+               app_init_data.argv_num = argv_num;
        }
 #endif  /* WIN32 */
 
@@ -1626,7 +272,7 @@ int main(
                int i;
                for (i = 0; i < argc; i++) {
                        if (STREQ(argv[i], "--debug") || STREQ(argv[i], "-d") ||
-                           STREQ(argv[i], "--debug-memory"))
+                           STREQ(argv[i], "--debug-memory") || STREQ(argv[i], "--debug-all"))
                        {
                                printf("Switching to fully guarded memory allocator.\n");
                                MEM_use_guarded_allocator();
@@ -1681,7 +327,7 @@ int main(
        CCL_init_logging(argv[0]);
 #endif
 
-       setCallbacks();
+       main_callback_setup();
        
 #if defined(__APPLE__) && !defined(WITH_PYTHON_MODULE)
        /* patch to ignore argument finder gives us (pid?) */
@@ -1707,15 +353,18 @@ int main(
 
        BLI_threadapi_init();
 
-       initglobals();  /* blender.c */
+       DNA_sdna_current_init();
+
+       BKE_blender_globals_init();  /* blender.c */
 
        IMB_init();
+       BKE_cachefiles_init();
        BKE_images_init();
        BKE_modifier_init();
        DAG_init();
 
        BKE_brush_system_init();
-       RE_init_texture_rng();
+       RE_texture_rng_init();
        
 
        BLI_callback_global_init();
@@ -1729,22 +378,15 @@ int main(
        /* first test for background */
 #ifndef WITH_PYTHON_MODULE
        ba = BLI_argsInit(argc, (const char **)argv); /* skip binary path */
-       setupArguments(C, ba, &syshandle);
 
-       BLI_argsParse(ba, 1, NULL, NULL);
+       /* ensure we free on early exit */
+       app_init_data.ba = ba;
 
-       if (use_crash_handler) {
-#ifdef WIN32
-               SetUnhandledExceptionFilter(windows_exception_handler);
-#else
-               /* after parsing args */
-               signal(SIGSEGV, blender_crash_handler);
-#endif
-       }
+       main_args_setup(C, ba, &syshandle);
 
-       if (use_abort_handler) {
-               signal(SIGABRT, blender_abort_handler);
-       }
+       BLI_argsParse(ba, 1, NULL, NULL);
+
+       main_signal_setup();
 
 #else
        G.factory_startup = true;  /* using preferences or user startup makes no sense for py-as-module */
@@ -1767,9 +409,8 @@ int main(
 #if defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS)
        G.background = true; /* python module mode ALWAYS runs in background mode (for now) */
 #else
-       /* for all platforms, even windos has it! */
        if (G.background) {
-               signal(SIGINT, blender_esc);  /* ctrl c out bg render */
+               main_signal_setup_background();
        }
 #endif
 
@@ -1827,7 +468,7 @@ int main(
 
        /* OK we are ready for it */
 #ifndef WITH_PYTHON_MODULE
-       BLI_argsParse(ba, 4, load_file, C);
+       main_args_setup_post(C, ba);
        
        if (G.background == 0) {
                if (!G.file_loaded)
@@ -1837,16 +478,22 @@ int main(
 
 #endif
 
+       /* Explicitly free data allocated for argument parsing:
+        * - 'ba'
+        * - 'argv' on WIN32.
+        */
+       callback_main_atexit(&app_init_data);
+       BKE_blender_atexit_unregister(callback_main_atexit, &app_init_data);
+
+       /* paranoid, avoid accidental re-use */
 #ifndef WITH_PYTHON_MODULE
-       BLI_argsFree(ba);
+       ba = NULL;
+       (void)ba;
 #endif
 
 #ifdef WIN32
-       while (argv_num) {
-               free(argv[--argv_num]);
-       }
-       free(argv);
        argv = NULL;
+       (void)argv;
 #endif
 
 #ifdef WITH_PYTHON_MODULE
@@ -1854,7 +501,7 @@ int main(
 #endif
 
        if (G.background) {
-               /* actually incorrect, but works for now (ton) */
+               /* Using window-manager API in background mode is a bit odd, but works fine. */
                WM_exit(C);
        }
        else {
@@ -1890,14 +537,4 @@ void main_python_exit(void)
 }
 #endif
 
-static void mem_error_cb(const char *errorStr)
-{
-       fputs(errorStr, stderr);
-       fflush(stderr);
-}
-
-static void setCallbacks(void)
-{
-       /* Error output from the alloc routines: */
-       MEM_set_error_callback(mem_error_cb);
-}
+/** \} */