diff options
author | Ton Roosendaal <ton@blender.org> | 2006-07-10 18:49:20 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-07-10 18:49:20 +0400 |
commit | 1cd74bab9930fe91acd64eb73a98dd10d51e997f (patch) | |
tree | 8a711af65257c3c86b1905254f14e8639bff9b54 /source | |
parent | 39764b0effd00bb29899ce5748c022980edfa3cb (diff) |
Bugfix #4652
Using TAB to type values in button sequences, didn't execute button
callbacks on the 2nd and and 3rd etc. Error could be noticed in the
Node Editor, Mapping node. That one didn't pass on changes to shading code.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/src/drawview.c | 9 | ||||
-rw-r--r-- | source/blender/src/interface.c | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 025d5180d85..29ff325f818 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -1166,7 +1166,7 @@ ImBuf *read_backbuf(short xmin, short ymin, short xmax, short ymax) if(ymax>=curarea->winy) ymaxc= curarea->winy-1; else ymaxc= ymax; if(yminc > ymaxc) return NULL; - ibuf= IMB_allocImBuf((xmaxc-xminc+1),(ymaxc-yminc+1),32,IB_rect,0); + ibuf= IMB_allocImBuf((xmaxc-xminc+1), (ymaxc-yminc+1), 32, IB_rect,0); check_backbuf(); // actually not needed for apple @@ -1185,8 +1185,13 @@ ImBuf *read_backbuf(short xmin, short ymin, short xmax, short ymax) dr++; } + ibuf->ftype= PNG; + IMB_saveiff(ibuf, "/tmp/rt.png", IB_rect); + /* put clipped result back, if needed */ - if(xminc==xmin && xmaxc==xmax && yminc==ymin && ymaxc==ymax) return ibuf; + if(xminc==xmin && xmaxc==xmax && yminc==ymin && ymaxc==ymax) + return ibuf; + ibuf1= IMB_allocImBuf( (xmax-xmin+1),(ymax-ymin+1),32,IB_rect,0); rd= ibuf->rect; dr= ibuf1->rect; diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c index ce980e96386..a9baa3ecd19 100644 --- a/source/blender/src/interface.c +++ b/source/blender/src/interface.c @@ -4642,8 +4642,10 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent) /* when mouse outside, don't do button */ if(inside || uevent->event!=LEFTMOUSE) { - if ELEM(uevent->event, BUT_NEXT, BUT_PREV) + if ELEM(uevent->event, BUT_NEXT, BUT_PREV) { butevent= ui_act_as_text_but(but); + uibut_do_func(but); + } else butevent= ui_do_button(block, but, uevent); |