diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-06-21 12:58:08 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-06-21 12:58:08 +0400 |
| commit | f28a1b438a8e322a2f0f7042ce9f0df730ea9c5f (patch) | |
| tree | 7f8403e911fdbde6c3b8cec93765b9674a2e63cf /source/blender | |
| parent | 5eb20cb91abe54d7b8de5c893da40dfe1719ea2c (diff) | |
Fix: the new "render out to Image Window" option didn't get a refresh
event on compositing changes.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/src/buttons_scene.c | 2 | ||||
| -rw-r--r-- | source/blender/src/renderwin.c | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index 026a2a49281..c2421311cfd 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1821,7 +1821,7 @@ static void render_panel_layers(void) draw_3d_layer_buttons(block, &srl->lay, 130, 95, 35, 30); uiBlockBeginAlign(block); - uiDefButBitS(block, TOG, SCE_LAY_SKY, B_NOP,"Sky", 10, 70, 40, 20, &srl->layflag, 0, 0, 0, 0, "Render Solid faces in this Layer"); + uiDefButBitS(block, TOG, SCE_LAY_SKY, B_NOP,"Sky", 10, 70, 40, 20, &srl->layflag, 0, 0, 0, 0, "Render Sky or backbuffer in this Layer"); uiDefButBitS(block, TOG, SCE_LAY_SOLID, B_NOP,"Solid", 50, 70, 65, 20, &srl->layflag, 0, 0, 0, 0, "Render Solid faces in this Layer"); uiDefButBitS(block, TOG, SCE_LAY_ZTRA, B_NOP,"Ztra", 115, 70, 65, 20, &srl->layflag, 0, 0, 0, 0, "Render Z-Transparent faces in this Layer"); uiDefButBitS(block, TOG, SCE_LAY_HALO, B_NOP,"Halo", 180, 70, 65, 20, &srl->layflag, 0, 0, 0, 0, "Render Halos in this Layer"); diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index d27c58b3e0c..72072e16cf3 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -62,13 +62,15 @@ #include "BMF_Api.h" -#include "DNA_view3d_types.h" +#include "DNA_image_types.h" #include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_view3d_types.h" #include "DNA_vec_types.h" #include "BKE_global.h" #include "BKE_image.h" +#include "BKE_library.h" #include "BKE_scene.h" #include "BKE_utildefines.h" #include "BKE_writeavi.h" /* movie handle */ @@ -1306,6 +1308,14 @@ void BIF_redraw_render_rect(void) if (render_win) { renderwin_queue_redraw(render_win); } + else { + Image *ima = (Image *)find_id("IM", "Render Result"); + if(ima && ima->ibuf) { + IMB_freeImBuf(ima->ibuf); + ima->ibuf= NULL; + allqueue(REDRAWIMAGE, 0); + } + } } void BIF_swap_render_rects(void) |