From 6b6cc8d97a8ea8eb330930da1df030cbdfbc907e Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Mon, 10 Nov 2003 15:28:48 +0000 Subject: - further tweaking of selecting objects... I keep forgetting to add 'curarea->win_swap= WIN_FRONT_OK;' after drawing in frontbuffer... tsk tsk! --- source/blender/src/drawobject.c | 1 + source/blender/src/editview.c | 18 ++++++++---------- source/blender/src/header_image.c | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 265d53639cc..d3a380e3490 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -3762,4 +3762,5 @@ void draw_object_ext(Base *base) G.zbuf= 0; glDisable(GL_DEPTH_TEST); } + curarea->win_swap= WIN_FRONT_OK; } diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index 876ddab7dbf..946585a6794 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -436,7 +436,6 @@ void selectall_layer(int layernum) static void deselectall_except(Base *b) /* deselect all except b */ { Base *base; - int redraw=0; base= FIRSTBASE; while(base) { @@ -444,13 +443,10 @@ static void deselectall_except(Base *b) /* deselect all except b */ if(b!=base) { base->flag &= ~SELECT; base->object->flag= base->flag; - redraw= 1; } } base= base->next; } - if(redraw) allqueue(REDRAWVIEW3D, 0); - countall(); } #if 0 @@ -627,14 +623,14 @@ void mouse_select(void) // copy basact->object->flag= basact->flag; - // for visual speed - draw_object_ext(basact); - if(oldbasact != basact) draw_object_ext(oldbasact); - if(oldbasact != basact) { set_active_base(basact); } - + + // for visual speed + if(oldbasact != basact) draw_object_ext(oldbasact); + draw_object_ext(basact); + if(basact->object->type!=OB_MESH) { if(G.f & G_WEIGHTPAINT) { set_wpaint(); /* toggle */ @@ -646,7 +642,9 @@ void mouse_select(void) set_faceselect(); /* toggle */ } } - + /* also because multiple 3d windows can be open */ + allqueue(REDRAWVIEW3D, 0); + allqueue(REDRAWBUTSLOGIC, 0); allqueue(REDRAWDATASELECT, 0); allqueue(REDRAWBUTSOBJECT, 0); diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index b3715584623..12a4fc2ead1 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -206,7 +206,7 @@ void do_image_buttons(unsigned short event) Image *ima; ID *id, *idtest; int nr; - char name[256], str[256]; + char name[256]; if(curarea->win==0) return; -- cgit v1.2.3