[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32127] trunk/blender/source/blender/ blenkernel/intern/image.c: Fix for fix in revision 32122, viewer node wasn' t working anymore in some cases.

[Brecht Van Lommel]

Revision: 32127
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32127
Author:   blendix
Date:     2010-09-26 00:21:35 +0200 (Sun, 26 Sep 2010)

Log Message:
-----------
Fix for fix in revision 32122, viewer node wasn't working anymore in some cases.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32122

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2010-09-25 21:09:58 UTC (rev 32126)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2010-09-25 22:21:35 UTC (rev 32127)
@@ -2139,10 +2139,15 @@
 						BLI_lock_thread(LOCK_VIEWER);
 						*lock_r= ima;
 
-						/* Composite Viewer, all handled in compositor */
-						/* fake ibuf, will be filled in compositor */
-						ibuf= IMB_allocImBuf(256, 256, 32, IB_rect, 0);
-						image_assign_ibuf(ima, ibuf, 0, frame);
+						frame= iuser?iuser->framenr:0;
+						ibuf= image_get_ibuf(ima, 0, frame);
+
+						if(!ibuf) {
+							/* Composite Viewer, all handled in compositor */
+							/* fake ibuf, will be filled in compositor */
+							ibuf= IMB_allocImBuf(256, 256, 32, IB_rect, 0);
+							image_assign_ibuf(ima, ibuf, 0, frame);
+						}
 					}
 				}
 			}