Revision: 23532 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23532 Author: blendix Date: 2009-09-28 16:33:38 +0200 (Mon, 28 Sep 2009)
Log Message: ----------- Fix #19351: items in outliner disappear prematurely. Note icons still disappear too soon, but this is an issue in the icon system, same happens on all buttons, will have a fix for this later. Modified Paths: -------------- trunk/blender/source/blender/editors/space_outliner/outliner.c Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c =================================================================== --- trunk/blender/source/blender/editors/space_outliner/outliner.c 2009-09-28 14:28:45 UTC (rev 23531) +++ trunk/blender/source/blender/editors/space_outliner/outliner.c 2009-09-28 14:33:38 UTC (rev 23532) @@ -4324,7 +4324,7 @@ tselem= TREESTORE(te); - if(*starty >= ar->v2d.cur.ymin && *starty<= ar->v2d.cur.ymax) { + if(*starty+2*OL_H >= ar->v2d.cur.ymin && *starty<= ar->v2d.cur.ymax) { glEnable(GL_BLEND); @@ -4579,7 +4579,7 @@ ystart= (int)ar->v2d.tot.ymax; ystart= OL_H*(ystart/(OL_H)); - while(ystart > ar->v2d.cur.ymin) { + while(ystart+2*OL_H > ar->v2d.cur.ymin) { glRecti(0, ystart, (int)ar->v2d.cur.xmax, ystart+OL_H); ystart-= 2*OL_H; } @@ -4597,7 +4597,7 @@ ystart= (int)ar->v2d.tot.ymax; ystart= OL_H*(ystart/(OL_H)); - while(ystart > ar->v2d.cur.ymin) { + while(ystart+2*OL_H > ar->v2d.cur.ymin) { glRecti((int)ar->v2d.cur.xmax-OL_TOGW, ystart, (int)ar->v2d.cur.xmax, ystart+OL_H); ystart-= 2*OL_H; } @@ -4812,7 +4812,7 @@ for(te= lb->first; te; te= te->next) { tselem= TREESTORE(te); - if(te->ys >= ar->v2d.cur.ymin && te->ys <= ar->v2d.cur.ymax) { + if(te->ys+2*OL_H >= ar->v2d.cur.ymin && te->ys <= ar->v2d.cur.ymax) { /* objects have toggle-able restriction flags */ if(tselem->type==0 && te->idcode==ID_OB) { ob = (Object *)tselem->id; @@ -4924,7 +4924,7 @@ for(te= lb->first; te; te= te->next) { tselem= TREESTORE(te); - if(te->ys >= ar->v2d.cur.ymin && te->ys <= ar->v2d.cur.ymax) { + if(te->ys+2*OL_H >= ar->v2d.cur.ymin && te->ys <= ar->v2d.cur.ymax) { if(tselem->type == TSE_RNA_PROPERTY) { ptr= &te->rnaptr; prop= te->directdata; @@ -5139,7 +5139,7 @@ for(te= lb->first; te; te= te->next) { tselem= TREESTORE(te); - if(te->ys >= ar->v2d.cur.ymin && te->ys <= ar->v2d.cur.ymax) { + if(te->ys+2*OL_H >= ar->v2d.cur.ymin && te->ys <= ar->v2d.cur.ymax) { uiBut *but; char *str; int xstart= 240; @@ -5217,7 +5217,7 @@ for(te= lb->first; te; te= te->next) { tselem= TREESTORE(te); - if(te->ys >= ar->v2d.cur.ymin && te->ys <= ar->v2d.cur.ymax) { + if(te->ys+2*OL_H >= ar->v2d.cur.ymin && te->ys <= ar->v2d.cur.ymax) { if(tselem->flag & TSE_TEXTBUT) { _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs