[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27887] trunk/blender/source/blender/nodes /intern/CMP_nodes/CMP_splitViewer.c: Fix:

[Matt Ebb]

Revision: 27887
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27887
Author:   broken
Date:     2010-03-31 04:21:32 +0200 (Wed, 31 Mar 2010)

Log Message:
-----------
Fix:
[#21841] SplitViewer doesn't backdrop in Node Editor
[#21803] Cant See Split Viewer on UV editor

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c	2010-03-31 00:55:01 UTC (rev 27886)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c	2010-03-31 02:21:32 UTC (rev 27887)
@@ -61,6 +61,7 @@
 		CompBuf *cbuf, *buf1, *buf2, *mask;
 		int x, y;
 		float offset;
+		void *lock;
 		
 		buf1= typecheck_compbuf(in[0]->data, CB_RGBA);
 		buf2= typecheck_compbuf(in[1]->data, CB_RGBA);
@@ -68,9 +69,10 @@
 		BKE_image_user_calc_frame(node->storage, rd->cfra, 0);
 		
 		/* always returns for viewer image, but we check nevertheless */
-		ibuf= BKE_image_get_ibuf(ima, node->storage);
+		ibuf= BKE_image_acquire_ibuf(ima, node->storage, &lock);
 		if(ibuf==NULL) {
 			printf("node_composit_exec_viewer error\n");
+			BKE_image_release_ibuf(ima, lock);
 			return;
 		}
 		
@@ -121,6 +123,8 @@
 		
 		composit3_pixel_processor(node, cbuf, buf1, in[0]->vec, buf2, in[1]->vec, mask, NULL, do_copy_split_rgba, CB_RGBA, CB_RGBA, CB_VAL);
 		
+		BKE_image_release_ibuf(ima, lock);
+		
 		generate_preview(data, node, cbuf);
 		free_compbuf(cbuf);
 		free_compbuf(mask);