diff options
| author | Ton Roosendaal <ton@blender.org> | 2013-02-09 20:54:10 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2013-02-09 20:54:10 +0400 |
| commit | d1136ba2efab8c4a1475b1778eb7b2bd9c8c8658 (patch) | |
| tree | fa22df2a26528df16502199f1059f71ebd0cbe92 /source/blender/imbuf/intern/openexr/openexr_api.cpp | |
| parent | f34d1d55850cd82fbae843ffafa7115dab0e0eeb (diff) | |
Bug fix #34174
Multilayer files saved from Maya (and I bet others) store the 'primary' layer without
layer or pass name, just as R G B A. Allows viewers to show stuff too, I guess.
Blender now reads this as well, just allowing an empty string for the layer and pass.
Diffstat (limited to 'source/blender/imbuf/intern/openexr/openexr_api.cpp')
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 18b08c9b59b..1b7aa1e7e63 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -882,6 +882,12 @@ static int imb_exr_split_channel_name(ExrChannel *echan, char *layname, char *pa const char *token; char tokenbuf[EXR_TOT_MAXNAME]; int len; + + /* some multilayers have the combined buffer with names A B G R saved */ + if (name[1] == 0) { + echan->chan_id = name[0]; + return 1; + } /* last token is single character channel identifier */ len = imb_exr_split_token(name, end, &token); |