[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54412] trunk/blender/source/blender/imbuf /intern/openexr/openexr_api.cpp: Bug fix #34174

[Ton Roosendaal]

Revision: 54412
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54412
Author:   ton
Date:     2013-02-09 16:54:10 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp

Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp	2013-02-09 16:19:30 UTC (rev 54411)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp	2013-02-09 16:54:10 UTC (rev 54412)
@@ -882,6 +882,12 @@
 	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);