[Bf-blender-cvs] [eed7efa] master: error in own last commit
Campbell Barton
noreply at git.blender.org
Sat Jul 11 18:38:26 CEST 2015
Commit: eed7efa151f3c17b65f38c4fd37543cbfe97b221
Author: Campbell Barton
Date: Sun Jul 12 01:43:32 2015 +1000
Branches: master
https://developer.blender.org/rBeed7efa151f3c17b65f38c4fd37543cbfe97b221
error in own last commit
===================================================================
M source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 3ba8d8e..ff6f55a 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'};
More information about the Bf-blender-cvs
mailing list