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

Make sure Multilayer EXR from other apps are read in as multilayer.

Browse Source
This commit is contained in:
Nathan Letwory 2012-04-03 11:53:38 +00:00
parent 03479c04ed
commit 0d69b18a05
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@
#include <stdio.h>
#include <stddef.h>
#include <string>
#include <set>
#include <openexr_api.h>
@ -945,12 +946,17 @@ static int exr_has_zbuffer(InputFile *file)
return !(file->header().channels().findChannel("Z") == NULL);
}
static int exr_is_renderresult(InputFile *file)
static int exr_is_multilayer(InputFile *file)
{
const StringAttribute *comments= file->header().findTypedAttribute<StringAttribute>("BlenderMultiChannel");
if (comments)
// if (comments->value() == "Blender MultiChannel")
const ChannelList &channels = file->header().channels();
std::set <std::string> layerNames;
channels.layers(layerNames);
if (comments || layerNames.size()>1)
return 1;
return 0;
}
@ -977,7 +983,7 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, size_t size, int flags)
if (0) // debug
exr_print_filecontents(file);
is_multi= exr_is_renderresult(file);
is_multi= exr_is_multilayer(file);
/* do not make an ibuf when */
if (is_multi && !(flags & IB_test) && !(flags & IB_multilayer))