sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T54269: saved EXR file files unreadable some editors in Blender.

Browse Source 
Don't write the multichannel metadata when there is only a single layer,
and don't unnecessarily consider single layer images with Blender metadata
as multi layer.
This commit is contained in:
Brecht Van Lommel 2018-03-10 04:33:14 +01:00
parent d526b35ce2
commit 50dde3d01a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/imbuf/intern/openexr/openexr_api.cpp
View File

@ -1621,14 +1621,13 @@ static bool exr_has_alpha(MultiPartInputFile& file)
static bool imb_exr_is_multilayer_file(MultiPartInputFile& file)
{
const StringAttribute *comments = file.header(0).findTypedAttribute<StringAttribute>("BlenderMultiChannel");
const ChannelList& channels = file.header(0).channels();
std::set <std::string> layerNames;
/* will not include empty layer names */
channels.layers(layerNames);
if (comments || layerNames.size() > 1)
if (layerNames.size() > 1)
return true;
if (layerNames.size()) {
@ -1667,7 +1666,7 @@ static void imb_exr_type_by_channels(ChannelList& channels, StringVector& views,
}
else {
*r_singlelayer = false;
*r_multilayer = true;
*r_multilayer = (layerNames.size() > 1);
*r_multiview = false;
return;
}