blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2017-08-13 01:14:55 +10:00
parent 57f1475b18 b500f42700
commit 22872857d4
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/util/util_types.h
View File

@ -28,6 +28,7 @@
#endif
#include "util/util_defines.h"
#include "util/util_optimization.h"
#ifndef __KERNEL_GPU__
# include "util/util_simd.h"

7
source/blender/blenkernel/intern/blendfile.c
View File

@ -117,6 +117,7 @@ static void setup_app_data(
const char *filepath, ReportList *reports)
{
Scene *curscene = NULL;
const bool is_startup = (bfd->filename[0] == '\0');
const bool recover = (G.fileflags & G_FILE_RECOVER) != 0;
enum {
LOAD_UI = 1,
@ -132,7 +133,7 @@ static void setup_app_data(
else if (BLI_listbase_is_empty(&bfd->main->screen)) {
mode = LOAD_UNDO;
}
else if (G.fileflags & G_FILE_NO_UI) {
else if ((G.fileflags & G_FILE_NO_UI) && (is_startup == false)) {
mode = LOAD_UI_OFF;
}
else {
@ -264,7 +265,9 @@ static void setup_app_data(
CTX_data_scene_set(C, curscene);
}
else {
G.fileflags = bfd->fileflags;
/* Keep state from preferences. */
const int fileflags_skip = G_FILE_FLAGS_RUNTIME;
G.fileflags = (G.fileflags & fileflags_skip) | (bfd->fileflags & ~fileflags_skip);
CTX_wm_manager_set(C, G.main->wm.first);
CTX_wm_screen_set(C, bfd->curscreen);
CTX_data_scene_set(C, bfd->curscene);

3
source/blender/windowmanager/intern/wm_init_exit.c
View File

@ -189,9 +189,6 @@ void WM_init(bContext *C, int argc, const char **argv)
BLF_init(); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */
BLT_lang_init();
/* Enforce loading the UI for the initial homefile */
G.fileflags &= ~G_FILE_NO_UI;
/* reports cant be initialized before the wm,
* but keep before file reading, since that may report errors */
wm_init_reports(C);