Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2010-03-31 06:21:32 +0400
committerMatt Ebb <matt@mke3.net>2010-03-31 06:21:32 +0400
commit89cd90379fcf99b12ae08d355918f396eb697725 (patch)
tree6cb2275e50c6528091e9338d1d0e1ef75aed115f
parent4a451714d64e0628e06cce6f7cdedcb88a79efc5 (diff)
Fix:
[#21841] SplitViewer doesn't backdrop in Node Editor [#21803] Cant See Split Viewer on UV editor
-rw-r--r--source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c b/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
index 889de9d1d18..98bda1bd7fa 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
@@ -61,6 +61,7 @@ static void node_composit_exec_splitviewer(void *data, bNode *node, bNodeStack *
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 @@ static void node_composit_exec_splitviewer(void *data, bNode *node, bNodeStack *
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 @@ static void node_composit_exec_splitviewer(void *data, bNode *node, bNodeStack *
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);