[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55624] trunk/blender/source/blender: Fix #34779: Channels disappear from multilayer exr sequence

[Sergey Sharybin]

Revision: 55624
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55624
Author:   nazgul
Date:     2013-03-27 11:26:10 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
Fix #34779: Channels disappear from multilayer exr sequence

Issue was caused by delayed or missing image user frame
number update, which lead to image loading failure in
cases node is updating from image signal callback.

Solved in a way that file from image datablock is used
for sockets detection instead of loading image for
current frame.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_image.h
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c

Modified: trunk/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_image.h	2013-03-27 10:14:09 UTC (rev 55623)
+++ trunk/blender/source/blender/blenkernel/BKE_image.h	2013-03-27 11:26:10 UTC (rev 55624)
@@ -232,6 +232,8 @@
 unsigned char *BKE_image_get_pixels_for_frame(struct Image *image, int frame);
 float *BKE_image_get_float_pixels_for_frame(struct Image *image, int frame);
 
+/* Guess offset for the first frame in the sequence */
+int BKE_image_sequence_guess_offset(struct Image *image);
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2013-03-27 10:14:09 UTC (rev 55623)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2013-03-27 11:26:10 UTC (rev 55624)
@@ -3430,3 +3430,15 @@
 
 	return pixels;
 }
+
+int BKE_image_sequence_guess_offset(Image *image)
+{
+	unsigned short numlen;
+	char head[FILE_MAX], tail[FILE_MAX];
+	char num[FILE_MAX] = {0};
+
+	BLI_stringdec(image->name, head, tail, &numlen);
+	BLI_strncpy(num, image->name + strlen(head), numlen + 1);
+
+	return atoi(num);
+}

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c	2013-03-27 10:14:09 UTC (rev 55623)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c	2013-03-27 11:26:10 UTC (rev 55624)
@@ -174,11 +174,24 @@
 {
 	Image *ima= (Image *)node->id;
 	if (ima) {
-		ImageUser *iuser= node->storage;
+		ImageUser *iuser = node->storage;
+		ImageUser load_iuser = {0};
 		ImBuf *ibuf;
-		
+		int offset = BKE_image_sequence_guess_offset(ima);
+
+		/* It is possible that image user in this node is not
+		 * properly updated yet. In this case loading image will
+		 * fail and sockets detection will go wrong.
+		 *
+		 * So we manually construct image user to be sure first
+		 * image from sequence (that one which is set as fileanme
+		 * for image datablock) is used for sockets detection
+		 */
+		load_iuser.ok = 1;
+		load_iuser.framenr = offset;
+
 		/* make sure ima->type is correct */
-		ibuf = BKE_image_acquire_ibuf(ima, iuser, NULL);
+		ibuf = BKE_image_acquire_ibuf(ima, &load_iuser, NULL);
 		
 		if (ima->rr) {
 			RenderLayer *rl= BLI_findlink(&ima->rr->layers, iuser->layer);