Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-01-19 17:07:12 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-01-19 17:07:12 +0300
commit18ae259cc4b60a670f4bf5cbd621bbe420c0c24b (patch)
treefdb67bc2e69939bdb45ff4cde286bcc344a18dae /source/blender/blenkernel
parent45dfb3b74231dcaffcc8677435488b6eb18132de (diff)
Cleanup: unused Global flags.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_global.h4
-rw-r--r--source/blender/blenkernel/intern/blender.c6
2 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index a7aa4c6969a..e70689b4c4e 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -70,7 +70,6 @@ typedef struct Global {
bool factory_startup;
short moving;
- short winpos, displaymode; /* used to be in Render */
/* to indicate render is busy, prevent renderwindow events etc */
bool is_rendering;
@@ -90,9 +89,6 @@ typedef struct Global {
/* this variable is written to / read from FileGlobal->fileflags */
int fileflags;
- /* save the allowed windowstate of blender when using -W or -w (GHOST_TWindowState) */
- int windowstate;
-
/* message to use when autoexec fails */
char autoexec_fail[200];
} Global;
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index be72fe29d82..78b937c849c 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -146,10 +146,6 @@ void initglobals(void)
else
BLI_snprintf(versionstr, sizeof(versionstr), "v%d.%02d", BLENDER_VERSION / 100, BLENDER_VERSION % 100);
-#ifdef _WIN32
- G.windowstate = 0;
-#endif
-
#ifndef WITH_PYTHON_SECURITY /* default */
G.f |= G_SCRIPT_AUTOEXEC;
#else
@@ -291,8 +287,6 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filepath
CTX_data_scene_set(C, curscene);
}
else {
- G.winpos = bfd->winpos;
- G.displaymode = bfd->displaymode;
G.fileflags = bfd->fileflags;
CTX_wm_manager_set(C, G.main->wm.first);
CTX_wm_screen_set(C, bfd->curscreen);