diff options
author | Ton Roosendaal <ton@blender.org> | 2006-12-21 13:41:43 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-12-21 13:41:43 +0300 |
commit | b12927ecb87b68387b7126283abf5bee7845cde4 (patch) | |
tree | 2d830777917517fda87a7a9a541d7950cb57798e /source/blender/src | |
parent | 96dd39b84f551bbb2f9adfd024dbaeafa22f5e49 (diff) |
MultiLayer images: added support for choosing compression type.
Without setting anything, it uses ZIP now as default, which gives the best
lossless compression and works nice fast.
Diffstat (limited to 'source/blender/src')
-rw-r--r-- | source/blender/src/buttons_scene.c | 17 | ||||
-rw-r--r-- | source/blender/src/editsima.c | 2 | ||||
-rw-r--r-- | source/blender/src/writeimage.c | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index e96bf44cd94..9a4d3514e9d 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1540,15 +1540,16 @@ static void render_panel_format(void) } #ifdef WITH_OPENEXR } - else if (G.scene->r.imtype == R_OPENEXR ) { - if (G.scene->r.quality > 5) G.scene->r.quality = 0; - - uiBlockBeginAlign(block); - uiDefButBitS(block, TOG, R_OPENEXR_HALF, B_NOP,"Half", 892,yofs+44,60,20, &G.scene->r.subimtype, 0, 0, 0, 0, "Use 16 bits float 'Half' type"); - uiDefButBitS(block, TOG, R_OPENEXR_ZBUF, B_NOP,"Zbuf", 952,yofs+44,60,20, &G.scene->r.subimtype, 0, 0, 0, 0, "Save the zbuffer as 32 bits unsigned int"); - uiBlockEndAlign(block); - uiDefButBitS(block, TOG, R_PREVIEW_JPG, B_NOP,"Preview",1027,yofs+44,90,20, &G.scene->r.subimtype, 0, 0, 0, 0, "When animation render, save JPG preview images in same directory"); + else if (ELEM(G.scene->r.imtype, R_OPENEXR, R_MULTILAYER)) { + if (G.scene->r.quality > 5) G.scene->r.quality = 2; + if(G.scene->r.imtype==R_OPENEXR) { + uiBlockBeginAlign(block); + uiDefButBitS(block, TOG, R_OPENEXR_HALF, B_NOP,"Half", 892,yofs+44,60,20, &G.scene->r.subimtype, 0, 0, 0, 0, "Use 16 bits float 'Half' type"); + uiDefButBitS(block, TOG, R_OPENEXR_ZBUF, B_NOP,"Zbuf", 952,yofs+44,60,20, &G.scene->r.subimtype, 0, 0, 0, 0, "Save the zbuffer as 32 bits unsigned int"); + uiBlockEndAlign(block); + uiDefButBitS(block, TOG, R_PREVIEW_JPG, B_NOP,"Preview",1027,yofs+44,90,20, &G.scene->r.subimtype, 0, 0, 0, 0, "When animation render, save JPG preview images in same directory"); + } uiDefButS(block, MENU,B_NOP, "Codec %t|None %x0|Pxr24 (lossy) %x1|ZIP (lossless) %x2|PIZ (lossless) %x3|RLE (lossless) %x4", 892,yofs,112,20, &G.scene->r.quality, 0, 0, 0, 0, "Set codec settings for OpenEXR"); diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c index 21a74dc95d3..cb25f615414 100644 --- a/source/blender/src/editsima.c +++ b/source/blender/src/editsima.c @@ -1656,7 +1656,7 @@ static void save_image_doit(char *name) if(G.sima->imtypenr==R_MULTILAYER) { RenderResult *rr= BKE_image_get_renderresult(ima); if(rr) { - RE_WriteRenderResult(rr, str); + RE_WriteRenderResult(rr, str, G.scene->r.quality); BLI_strncpy(ima->name, name, sizeof(ima->name)); BLI_strncpy(ibuf->name, str, sizeof(ibuf->name)); diff --git a/source/blender/src/writeimage.c b/source/blender/src/writeimage.c index 530d0535baa..3ef29169b54 100644 --- a/source/blender/src/writeimage.c +++ b/source/blender/src/writeimage.c @@ -113,7 +113,7 @@ static void save_rendered_image_cb_real(char *name, int confirm) if(G.scene->r.imtype==R_MULTILAYER) { RenderResult *rr= RE_GetResult(RE_GetRender(G.scene->id.name)); if(rr) - RE_WriteRenderResult(rr, str); + RE_WriteRenderResult(rr, str, G.scene->r.quality); } else { RenderResult rres; |