diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-10-31 14:51:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-10-31 14:51:10 +0300 |
| commit | 06abc862b0d67c2e7d1274ef0c90f55d24d8f625 (patch) | |
| tree | e0a1c80ef412ed75699e1b91ca2a4e91b9699d76 /source/blender/editors | |
| parent | beb5f84991ad9ab40b7187bf7e327ff938c9f747 (diff) | |
Fix crashing running read full sample layers operator.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index b8bfed2b75e..c9f51078cec 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -1904,13 +1904,14 @@ void NODE_OT_read_renderlayers(wmOperatorType *ot) static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *UNUSED(op)) { + Main *bmain= CTX_data_main(C); SpaceNode *snode= CTX_wm_space_node(C); Scene *curscene= CTX_data_scene(C); Render *re= RE_NewRender(curscene->id.name); // WM_cursor_wait(1); - RE_MergeFullSample(re, curscene, snode->nodetree); + RE_MergeFullSample(re, bmain, curscene, snode->nodetree); snode_notify(C, snode); // WM_cursor_wait(0); |