diff options
author | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
commit | 7246c387435769a169ac24c91434c615df6434b4 (patch) | |
tree | 61842e3e0ce85e80720fdd7476d44d2e629f59fd /source/blender/editors/screen/screendump.c | |
parent | c5f55d17096d373791363e46004176e3f7f7ae52 (diff) | |
parent | 0b4bd3ddc016298e868169a541cf6c132b10c587 (diff) |
Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view
Diffstat (limited to 'source/blender/editors/screen/screendump.c')
-rw-r--r-- | source/blender/editors/screen/screendump.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 38a9d8ba7ab..569d6c2793c 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -124,7 +124,8 @@ static int screenshot_exec(bContext *C, wmOperator *op) scd->dumprect = ibuf->rect; } - if (scd->im_format.planes == R_IMF_PLANES_BW) { + if ((scd->im_format.planes == R_IMF_PLANES_BW) && + (scd->im_format.imtype != R_IMF_IMTYPE_MULTILAYER)) { /* bw screenshot? - users will notice if it fails! */ IMB_color_to_bw(ibuf); } @@ -195,7 +196,7 @@ static bool screenshot_draw_check_prop(PointerRNA *UNUSED(ptr), { const char *prop_id = RNA_property_identifier(prop); - return !(STREQ(prop_id, "filepath")); + return !STREQ(prop_id, "filepath"); } static void screenshot_draw(bContext *UNUSED(C), wmOperator *op) |