diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
| commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
| tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/creator | |
| parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
| parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | source/creator/creator.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 367180407ba..b98b917815b 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -335,7 +335,7 @@ install( if(WITH_PYTHON) # install(CODE "message(\"copying blender scripts...\")") - + # exclude addons_contrib if release if("${BLENDER_VERSION_CYCLE}" STREQUAL "release" OR "${BLENDER_VERSION_CYCLE}" STREQUAL "rc") @@ -361,7 +361,7 @@ if(WITH_PYTHON) PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE PATTERN "${FREESTYLE_EXCLUDE_CONDITIONAL}" EXCLUDE ) - + unset(ADDON_EXCLUDE_CONDITIONAL) unset(FREESTYLE_EXCLUDE_CONDITIONAL) endif() @@ -648,7 +648,7 @@ if(UNIX AND NOT APPLE) unset(_suffix) endif() unset(_target_LIB) - + endif() endif() elseif(WIN32) @@ -812,7 +812,7 @@ elseif(WIN32) DESTINATION "." ) endif() - + if(WITH_SYSTEM_AUDASPACE) install( FILES @@ -829,7 +829,7 @@ elseif(WIN32) DESTINATION "." ) endif() - + install( # x86 builds can run on x64 Windows, so this is required at all times FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll DESTINATION "." diff --git a/source/creator/creator.c b/source/creator/creator.c index c2fd990f451..bda97fba863 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -333,7 +333,7 @@ int main( #endif main_callback_setup(); - + #if defined(__APPLE__) && !defined(WITH_PYTHON_MODULE) /* patch to ignore argument finder gives us (pid?) */ if (argc == 2 && STREQLEN(argv[1], "-psn_", 5)) { @@ -348,7 +348,7 @@ int main( } } #endif - + #ifdef __FreeBSD__ fpsetmask(0); #endif @@ -370,7 +370,7 @@ int main( BKE_brush_system_init(); RE_texture_rng_init(); - + BLI_callback_global_init(); @@ -418,7 +418,7 @@ int main( /* Initialize ffmpeg if built in, also needed for bg mode if videos are * rendered via ffmpeg */ BKE_sound_init_once(); - + init_def_material(); if (G.background == 0) { @@ -454,7 +454,7 @@ int main( #else printf("\n* WARNING * - Blender compiled without Python!\nthis is not intended for typical usage\n\n"); #endif - + CTX_py_init_set(C, 1); WM_keymap_init(C); @@ -472,7 +472,7 @@ int main( /* OK we are ready for it */ #ifndef WITH_PYTHON_MODULE main_args_setup_post(C, ba); - + if (G.background == 0) { if (!G.file_loaded) if (U.uiflag2 & USER_KEEP_SESSION) |