From b95d5bbf444fb405dcad8cf9732d3fc525e456cc Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Wed, 20 Dec 2006 19:23:57 +0000 Subject: [PATCH] Two bugfixes for Image commit: - Jkey press without a render crashed - UV FaceSelect, assign/view image, crashed all over... :) --- source/blender/src/header_image.c | 8 +++++--- source/blender/src/renderwin.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index d1bfcdbe125..e2839307212 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -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; } diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index bba8a9ebb45..2750f32e195 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -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;