bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Two bugfixes for Image commit:

Browse Source 
- Jkey press without a render crashed
- UV FaceSelect, assign/view image,  crashed all over... :)
This commit is contained in:
Ton Roosendaal 2006-12-20 19:23:57 +00:00
parent a76fcf6cb9
commit b95d5bbf44
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/src/header_image.c
View File

@ -1067,8 +1067,8 @@ static uiBlock *image_uvsmenu(void *arg_unused)
void image_buttons(void)
{
Image *ima= G.sima->image;
ImBuf *ibuf= BKE_image_get_ibuf(ima, &G.sima->iuser);
Image *ima;
ImBuf *ibuf;
uiBlock *block;
short xco, xmax;
char naam[256], *menuname;
@ -1084,6 +1084,8 @@ void image_buttons(void)
else uiBlockSetCol(block, TH_HEADERDESEL);
what_image(G.sima);
ima= G.sima->image;
ibuf= BKE_image_get_ibuf(ima, &G.sima->iuser);
curarea->butspacetype= SPACE_IMAGE;
@ -1187,7 +1189,7 @@ void image_buttons(void)
uiDefIconBut(block, BUT, B_SIMA_RECORD, ICON_REC, xco, 0, XIC, YIC, 0, 0, 0, 0, 0, "Record Composite");
xco+= XIC;
}
if((ima->type==IMA_TYPE_COMPOSITE) || ELEM(G.sima->image->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
if((ima->type==IMA_TYPE_COMPOSITE) || ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
uiDefIconBut(block, BUT, B_SIMA_PLAY, ICON_PLAY, xco, 0, XIC, YIC, 0, 0, 0, 0, 0, "Play");
xco+= XIC;
}

2
source/blender/src/renderwin.c
View File

@ -1348,7 +1348,7 @@ void BIF_swap_render_rects(void)
if(G.displaymode!=R_DISPLAYWIN) {
imagewindow_swap_render_rects();
}
else {
else if(render_win) {
render_win->storespare= 1;
render_win->showspare ^= 1;