Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-07-11 18:43:32 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-07-11 19:31:46 +0300
commiteed7efa151f3c17b65f38c4fd37543cbfe97b221 (patch)
tree930a0999981839901a36b0fb9b40f2906d9f1e0f /source/blender/imbuf/intern/openexr/openexr_api.cpp
parentb610ec50de3844319fb524fdcb2fa144abd15939 (diff)
error in own last commit
Diffstat (limited to 'source/blender/imbuf/intern/openexr/openexr_api.cpp')
-rw-r--r--source/blender/imbuf/intern/openexr/openexr_api.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 3ba8d8e98c1..ff6f55a777b 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -766,8 +766,10 @@ static void imb_exr_get_views(MultiPartInputFile& file, StringVector& views)
static void imb_exr_insert_view_name(char *name_full, const char *passname, const char *viewname)
{
BLI_assert(!ELEM(name_full, passname, viewname));
+
if (viewname == NULL || viewname[0] == '\0') {
BLI_strncpy(name_full, passname, sizeof(((ExrChannel *)NULL)->name));
+ return;
}
const char delims[] = {'.', '\0'};