[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32487] trunk/blender/source/blender/ windowmanager/intern/wm_window.c: Fix [#24260] Window geometry command-line option doesn't work
Nathan Letwory
nathan at letworyinteractive.com
Fri Oct 15 09:31:27 CEST 2010
Revision: 32487
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32487
Author: jesterking
Date: 2010-10-15 09:31:26 +0200 (Fri, 15 Oct 2010)
Log Message:
-----------
Fix [#24260] Window geometry command-line option doesn't work
Override the first window size with --window-geometry if given. startup.blend would otherwise open as lastly saved.
Modified Paths:
--------------
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c 2010-10-15 07:26:26 UTC (rev 32486)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c 2010-10-15 07:31:26 UTC (rev 32487)
@@ -68,6 +68,7 @@
/* set by commandline */
static int prefsizx= 0, prefsizy= 0, prefstax= 0, prefstay= 0, initialstate= GHOST_kWindowStateNormal;
+static int prefsizeused = 0;
/* ******** win open & close ************ */
@@ -372,18 +373,19 @@
for(win= wm->windows.first; win; win= win->next) {
if(win->ghostwin==NULL) {
- if(win->sizex==0) {
+ if(win->sizex==0 || prefsizeused==0) {
win->posx= prefstax;
win->posy= prefstay;
win->sizex= prefsizx;
win->sizey= prefsizy;
win->windowstate= initialstate;
+ prefsizeused= 1;
}
wm_window_add_ghostwindow(C, wm, "Blender", win);
}
/* happens after fileread */
if(win->eventstate==NULL)
- win->eventstate= MEM_callocN(sizeof(wmEvent), "window event state");
+ win->eventstate= MEM_callocN(sizeof(wmEvent), "window event state");
/* add keymap handlers (1 handler for all keys in map!) */
keymap= WM_keymap_find(wm->defaultconf, "Window", 0, 0);
More information about the Bf-blender-cvs
mailing list