Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for [#27307] Blender crashes when loading a new scene while baking fluid dynamics

Browse Source 
* Fluid bakes didn't respect the job stop flag.
* Also made msvc happy with some casts.
This commit is contained in:
Janne Karhu
2011-07-15 00:39:49 +00:00
parent b028cba0e4
commit 5ff9acfd28
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/physics/physics_fluid.c
View File

@@ -722,15 +722,17 @@ typedef struct FluidBakeJob {
static void fluidbake_free(void *customdata) static void fluidbake_free(void *customdata)
{ {
FluidBakeJob *fb= customdata; FluidBakeJob *fb= (FluidBakeJob *)customdata;
MEM_freeN(fb); MEM_freeN(fb);
} }
/* called by fluidbake, only to check job 'stop' value */ /* called by fluidbake, only to check job 'stop' value */
static int fluidbake_breakjob(void *UNUSED(customdata)) static int fluidbake_breakjob(void *customdata)
{ {
//FluidBakeJob *fb= (FluidBakeJob *)customdata; FluidBakeJob *fb= (FluidBakeJob *)customdata;
//return *(fb->stop);
if(fb->stop && *(fb->stop))
return 1;
/* this is not nice yet, need to make the jobs list template better /* this is not nice yet, need to make the jobs list template better
* for identifying/acting upon various different jobs */ * for identifying/acting upon various different jobs */
@@ -741,7 +743,7 @@ static int fluidbake_breakjob(void *UNUSED(customdata))
/* called by fluidbake, wmJob sends notifier */ /* called by fluidbake, wmJob sends notifier */
static void fluidbake_updatejob(void *customdata, float progress) static void fluidbake_updatejob(void *customdata, float progress)
{ {
FluidBakeJob *fb= customdata; FluidBakeJob *fb= (FluidBakeJob *)customdata;
*(fb->do_update)= 1; *(fb->do_update)= 1;
*(fb->progress)= progress; *(fb->progress)= progress;
@@ -749,7 +751,7 @@ static void fluidbake_updatejob(void *customdata, float progress)
static void fluidbake_startjob(void *customdata, short *stop, short *do_update, float *progress) static void fluidbake_startjob(void *customdata, short *stop, short *do_update, float *progress)
{ {
FluidBakeJob *fb= customdata; FluidBakeJob *fb= (FluidBakeJob *)customdata;
fb->stop= stop; fb->stop= stop;
fb->do_update = do_update; fb->do_update = do_update;
@@ -764,7 +766,7 @@ static void fluidbake_startjob(void *customdata, short *stop, short *do_update,
static void fluidbake_endjob(void *customdata) static void fluidbake_endjob(void *customdata)
{ {
FluidBakeJob *fb= customdata; FluidBakeJob *fb= (FluidBakeJob *)customdata;
if (fb->settings) { if (fb->settings) {
MEM_freeN(fb->settings); MEM_freeN(fb->settings);