Revision: 35699
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35699
Author: jhk
Date: 2011-03-22 13:30:50 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
Bug fix: Fluidsim crashed after clicking "bake" multiple times
* Fluid baking didn't check if there was already an ongoing job before starting
a new job.
Modified Paths:
--------------
trunk/blender/source/blender/editors/physics/physics_fluid.c
Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c
2011-03-22 13:30:20 UTC (rev 35698)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c
2011-03-22 13:30:50 UTC (rev 35699)
@@ -1081,9 +1081,11 @@
static int fluid_bake_exec(bContext *C, wmOperator *op)
{
- Object *ob= CTX_data_active_object(C);
+ /* only one bake job at a time */
+ if(WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C)))
+ return 0;
- if(!fluidsimBake(C, op->reports, ob))
+ if(!fluidsimBake(C, op->reports, CTX_data_active_object(C)))
return OPERATOR_CANCELLED;
return OPERATOR_FINISHED;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
