Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_image / image_ops.c
index 2cc5c7f8d682f2c5e11c29bc8f0253c36fd45ea8..6c0ab33dd2c01274073f091c12a426811f1357ce 100644 (file)
@@ -1858,7 +1858,7 @@ static bool save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI
                scene = CTX_data_scene(C);
                rr = BKE_image_acquire_renderresult(scene, ima);
                bool is_mono = rr ? BLI_listbase_count_ex(&rr->views, 2) < 2 : BLI_listbase_count_ex(&ima->views, 2) < 2;
-               bool is_exr_rr = rr && ELEM(imf->imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER);
+               bool is_exr_rr = rr && ELEM(imf->imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER) && RE_HasFloatPixels(rr);
 
                /* error handling */
                if (!rr) {