archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix crashing running read full sample layers operator.

Browse Source
This commit is contained in:
Brecht Van Lommel
2010-10-31 11:51:10 +00:00
parent beb5f84991
commit 06abc862b0
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

2
source/blender/render/extern/include/RE_pipeline.h vendored
View File

@@ -220,7 +220,7 @@ void RE_WriteRenderResult(RenderResult *rr, char *filename, int compress);
struct RenderResult *RE_MultilayerConvert(void *exrhandle, int rectx, int recty);
/* do a full sample buffer compo */
void RE_MergeFullSample(struct Render *re, struct Scene *sce, struct bNodeTree *ntree);
void RE_MergeFullSample(struct Render *re, struct Main *bmain, struct Scene *sce, struct bNodeTree *ntree);
/* ancient stars function... go away! */
void RE_make_stars(struct Render *re, struct Scene *scenev3d, void (*initfunc)(void),

4
source/blender/render/intern/source/pipeline.c
View File

@@ -2313,10 +2313,12 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree)
BLI_rw_mutex_unlock(&re->resultmutex);
}
void RE_MergeFullSample(Render *re, Scene *sce, bNodeTree *ntree)
void RE_MergeFullSample(Render *re, Main *bmain, Scene *sce, bNodeTree *ntree)
{
Scene *scene;
bNode *node;
re->main= bmain;
/* first call RE_ReadRenderResult on every renderlayer scene. this creates Render structs */