From 8babc5056f892f550f9b874a5aebefeaded3f10a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 25 Sep 2010 22:21:35 +0000 Subject: [PATCH] Fix for fix in revision 32122, viewer node wasn't working anymore in some cases. --- source/blender/blenkernel/intern/image.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 344f8500075..a199c1cf738 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2139,10 +2139,15 @@ ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r) 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); + } } } }