[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31031] trunk/blender/source/blender: Fix crash in point cache baking due to my recent changes.

[Brecht Van Lommel]

Revision: 31031
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31031
Author:   blendix
Date:     2010-08-04 10:58:38 +0200 (Wed, 04 Aug 2010)

Log Message:
-----------
Fix crash in point cache baking due to my recent changes.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/physics/physics_pointcache.c
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/editors/physics/physics_pointcache.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_pointcache.c	2010-08-04 08:49:56 UTC (rev 31030)
+++ trunk/blender/source/blender/editors/physics/physics_pointcache.c	2010-08-04 08:58:38 UTC (rev 31031)
@@ -34,13 +34,14 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_context.h"
+#include "BKE_global.h"
+#include "BKE_main.h"
+#include "BKE_modifier.h"
 #include "BKE_particle.h"
+#include "BKE_pointcache.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_utildefines.h" 
-#include "BKE_pointcache.h"
-#include "BKE_global.h"
-#include "BKE_modifier.h"
 
 #include "BLI_blenlib.h"
 
@@ -87,11 +88,12 @@
 
 static int ptcache_bake_all_exec(bContext *C, wmOperator *op)
 {
+	Main *bmain = CTX_data_main(C);
 	Scene *scene= CTX_data_scene(C);
 	wmWindow *win = G.background ? NULL : CTX_wm_window(C);
 	PTCacheBaker baker;
 
-
+	baker.main = bmain;
 	baker.scene = scene;
 	baker.pid = NULL;
 	baker.bake = RNA_boolean_get(op->ptr, "bake");
@@ -172,6 +174,7 @@
 }
 static int ptcache_bake_exec(bContext *C, wmOperator *op)
 {
+	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	wmWindow *win = G.background ? NULL : CTX_wm_window(C);
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "point_cache", &RNA_PointCache);
@@ -188,6 +191,7 @@
 			break;
 	}
 
+	baker.main = bmain;
 	baker.scene = scene;
 	baker.pid = pid;
 	baker.bake = RNA_boolean_get(op->ptr, "bake");

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2010-08-04 08:49:56 UTC (rev 31030)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2010-08-04 08:58:38 UTC (rev 31031)
@@ -2679,6 +2679,7 @@
 {
 	PTCacheBaker baker;
 
+	baker.main = re->main;
 	baker.scene = scene;
 	baker.pid = NULL;
 	baker.bake = 0;