Revision: 18957
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18957
Author: ton
Date: 2009-02-13 14:55:57 +0100 (Fri, 13 Feb 2009)
Log Message:
-----------
2.5
Bugfix: menus in "screen space" could go wrong because the code
accidentally used window->winid instead of screen->mainwin id.
(the first is window id, the 2nd wm subwindow id. On start both
are one, which made it not appear immediately).
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-02-13 13:33:01 UTC (rev 18956)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-02-13 13:55:57 UTC (rev 18957)
@@ -1610,8 +1610,8 @@
/* no subwindow created yet, for menus for example, so we
* use the main window instead, since buttons are created
* there anyway */
- wm_subwindow_getmatrix(window, window->winid, block->winmat);
- wm_subwindow_getsize(window, window->winid, &getsizex,
&getsizey);
+ wm_subwindow_getmatrix(window, window->screen->mainwin,
block->winmat);
+ wm_subwindow_getsize(window, window->screen->mainwin,
&getsizex, &getsizey);
block->aspect= 2.0/fabs(getsizex*block->winmat[0][0]);
block->auto_open= 2;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
