[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32790] trunk/blender/source/blender: Fix crashing running read full sample layers operator.

[Brecht Van Lommel]

Revision: 32790
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32790
Author:   blendix
Date:     2010-10-31 12:51:10 +0100 (Sun, 31 Oct 2010)

Log Message:
-----------
Fix crashing running read full sample layers operator.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_edit.c
    trunk/blender/source/blender/render/extern/include/RE_pipeline.h
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2010-10-31 08:42:42 UTC (rev 32789)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2010-10-31 11:51:10 UTC (rev 32790)
@@ -1904,13 +1904,14 @@
 
 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);

Modified: trunk/blender/source/blender/render/extern/include/RE_pipeline.h
===================================================================
--- trunk/blender/source/blender/render/extern/include/RE_pipeline.h	2010-10-31 08:42:42 UTC (rev 32789)
+++ trunk/blender/source/blender/render/extern/include/RE_pipeline.h	2010-10-31 11:51:10 UTC (rev 32790)
@@ -220,7 +220,7 @@
 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),

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2010-10-31 08:42:42 UTC (rev 32789)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2010-10-31 11:51:10 UTC (rev 32790)
@@ -2313,10 +2313,12 @@
 	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 */