huge commit, sorry!

this is part 1 of the UI makeover. It has:
- menu system from Matt integrated
- buttons drawing from Matt
- generic button panel system implemented
- converted displaybuttons (not the rest yet)
- cleaned up a lot in drawing spaces itself, to make it aligned and pixel exact.
- cleaned loads of little compiler warnings, protos...

still a lot of work needed, will all be in next week i hope!

(warn: 2 new c files! butspace.c and buttons_scene.c)
This commit is contained in:
2003-10-04 20:35:50 +00:00
parent c355aa06a8
commit 842bb449c5
34 changed files with 8227 additions and 2043 deletions

View File

@@ -140,7 +140,6 @@
#include "BDR_editobject.h"
#include "BDR_drawobject.h"
#include "BDR_editcurve.h"
#include "BDR_editface.h"
#include "render.h"
#include <time.h>
@@ -221,11 +220,14 @@ void free_and_unlink_base(Base *base)
void delete_obj(int ok)
{
Base *base;
extern int undo_push(char *);
if(G.obpose) return;
if(G.obedit) return;
if(G.scene->id.lib) return;
//if (undo_push("Erase")) return;
base= FIRSTBASE;
while(base) {
Base *nbase= base->next;
@@ -1397,7 +1399,7 @@ void special_editmenu(void)
if(me==0 || me->tface==0) return;
nr= pupmenu("Specials%t|Set Tex%x1| Shared%x2| Light%x3| Invisible%x4| Collision%x5|Clr Tex%x6| Shared%x7| Light%x8| Invisible%x9| Collision%x10|Sel Same UV%x11");
nr= pupmenu("Specials%t|Set Tex%x1| Shared%x2| Light%x3| Invisible%x4| Collision%x5|Clr Tex%x6| Shared%x7| Light%x8| Invisible%x9| Collision%x10");
for(a=me->totface, tface= me->tface; a>0; a--, tface++) {
if(tface->flag & SELECT) {
@@ -1424,8 +1426,6 @@ void special_editmenu(void)
tface->mode &= ~TF_INVISIBLE; break;
case 10:
tface->mode &= ~TF_DYNAMIC; break;
case 11:
get_same_uv(); break;
}
}
}
@@ -3514,7 +3514,7 @@ void headerprint(char *str)
{
areawinset(curarea->headwin);
headerbox(0xA09090, curarea->winx);
headerbox(curarea);
cpack(0x0);
glRasterPos2i(20+curarea->headbutofs, 6);
BMF_DrawString(G.font, str);