kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #28585: read full sample layers not working in compositor.

Browse Source
This commit is contained in:
Brecht Van Lommel 2011-09-22 12:45:25 +00:00
parent 780be0d918
commit 3833cb2e76
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/space_node/node_edit.c
View File

@ -2903,12 +2903,13 @@ static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *UNUSED(op))
Render *re= RE_NewRender(curscene->id.name);
WM_cursor_wait(1);
RE_MergeFullSample(re, bmain, curscene, snode->nodetree);
snode_notify(C, snode);
snode_dag_update(C, snode);
WM_cursor_wait(0);
/* note we are careful to send the right notifier, as otherwise the
compositor would reexecute and overwrite the full sample result */
WM_event_add_notifier(C, NC_SCENE|ND_COMPO_RESULT, NULL);
return OPERATOR_FINISHED;
}

3
source/blender/editors/space_node/space_node.c
View File

@ -178,6 +178,9 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
case ND_FRAME:
ED_area_tag_refresh(sa);
break;
case ND_COMPO_RESULT:
ED_area_tag_redraw(sa);
break;
case ND_TRANSFORM_DONE:
if(type==NTREE_COMPOSIT) {
if(snode->flag & SNODE_AUTO_RENDER) {