diff options
| author | Ton Roosendaal <ton@blender.org> | 2003-10-27 00:09:33 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2003-10-27 00:09:33 +0300 |
| commit | 0311189fb8a8f6fc04ad92fafc355a81324aa7d8 (patch) | |
| tree | 89007adda385dc4b9a8f940d45d27a9cb50795d9 | |
| parent | f0f851d96379dac82d79a2e4ea343eadbbe8c3df (diff) | |
- fixed printing in headers (during modes) for when there is no header...
(uhh.. i mean, then it doesnt print!)
- put back axis icon of 3d win to left/bottom corner.
it was only moved for tests with an extended header to the left...
| -rw-r--r-- | source/blender/src/drawview.c | 2 | ||||
| -rw-r--r-- | source/blender/src/editobject.c | 23 |
2 files changed, 15 insertions, 10 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index c56ce1348ae..26c73ed69bd 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -923,7 +923,7 @@ static void draw_view_icon(void) glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glRasterPos2f(curarea->winx-25.0, 5.0); + glRasterPos2f(5.0, 5.0); BIF_draw_icon(icon); glBlendFunc(GL_ONE, GL_ZERO); diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index e201724b303..7d6b4b9e401 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -3579,15 +3579,20 @@ void compatible_eul(float *eul, float *oldrot) void headerprint(char *str) { - areawinset(curarea->headwin); - - headerbox(curarea); - cpack(0x0); - glRasterPos2i(20+curarea->headbutofs, 6); - BMF_DrawString(G.font, str); - - curarea->head_swap= WIN_BACK_OK; - areawinset(curarea->win); + if(curarea->headertype) { + areawinset(curarea->headwin); + + headerbox(curarea); + cpack(0x0); + glRasterPos2i(20+curarea->headbutofs, 6); + BMF_DrawString(G.font, str); + + curarea->head_swap= WIN_BACK_OK; + areawinset(curarea->win); + } + else { + // dunno... thats for later (ton) + } } void add_ipo_tob_poin(float *poin, float *old, float delta) |