diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-02-13 16:55:57 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-02-13 16:55:57 +0300 |
| commit | 023ea476fd7beef702859326f55a698879ec2a5a (patch) | |
| tree | 6b9507a2cd5e398e3b759e2d6fb7930f3a4f2169 /source/blender | |
| parent | 1d5115c2512704afad35efd40082e63fda1863e8 (diff) | |
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).
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 8f96732a911..66d9653bdd0 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1610,8 +1610,8 @@ uiBlock *uiBeginBlock(const bContext *C, ARegion *region, char *name, short dt, /* 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; |