forked from bartvdbraak/blender
Fix #28585: read full sample layers not working in compositor.
This commit is contained in:
parent
780be0d918
commit
3833cb2e76
@ -2903,12 +2903,13 @@ static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *UNUSED(op))
|
|||||||
Render *re= RE_NewRender(curscene->id.name);
|
Render *re= RE_NewRender(curscene->id.name);
|
||||||
|
|
||||||
WM_cursor_wait(1);
|
WM_cursor_wait(1);
|
||||||
|
|
||||||
RE_MergeFullSample(re, bmain, curscene, snode->nodetree);
|
RE_MergeFullSample(re, bmain, curscene, snode->nodetree);
|
||||||
snode_notify(C, snode);
|
|
||||||
snode_dag_update(C, snode);
|
|
||||||
|
|
||||||
WM_cursor_wait(0);
|
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;
|
return OPERATOR_FINISHED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -178,6 +178,9 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
|
|||||||
case ND_FRAME:
|
case ND_FRAME:
|
||||||
ED_area_tag_refresh(sa);
|
ED_area_tag_refresh(sa);
|
||||||
break;
|
break;
|
||||||
|
case ND_COMPO_RESULT:
|
||||||
|
ED_area_tag_redraw(sa);
|
||||||
|
break;
|
||||||
case ND_TRANSFORM_DONE:
|
case ND_TRANSFORM_DONE:
|
||||||
if(type==NTREE_COMPOSIT) {
|
if(type==NTREE_COMPOSIT) {
|
||||||
if(snode->flag & SNODE_AUTO_RENDER) {
|
if(snode->flag & SNODE_AUTO_RENDER) {
|
||||||
|
Loading…
Reference in New Issue
Block a user