[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38408] trunk/blender/source/blender/ editors/physics/physics_fluid.c: Fix for [#27307] Blender crashes when loading a new scene while baking fluid dynamics

[Janne Karhu]

Revision: 38408
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38408
Author:   jhk
Date:     2011-07-15 00:39:49 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
Fix for [#27307] Blender crashes when loading a new scene while baking fluid 
dynamics
* Fluid bakes didn't respect the job stop flag.
* Also made msvc happy with some casts.

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-07-15 00:01:23 UTC (rev 38407)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c        
2011-07-15 00:39:49 UTC (rev 38408)
@@ -722,15 +722,17 @@
 
 static void fluidbake_free(void *customdata)
 {
-       FluidBakeJob *fb= customdata;
+       FluidBakeJob *fb= (FluidBakeJob *)customdata;
        MEM_freeN(fb);
 }
 
 /* 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;
-       //return *(fb->stop);
+       FluidBakeJob *fb= (FluidBakeJob *)customdata;
+
+       if(fb->stop && *(fb->stop))
+               return 1;
        
        /* this is not nice yet, need to make the jobs list template better 
         * for identifying/acting upon various different jobs */
@@ -741,7 +743,7 @@
 /* called by fluidbake, wmJob sends notifier */
 static void fluidbake_updatejob(void *customdata, float progress)
 {
-       FluidBakeJob *fb= customdata;
+       FluidBakeJob *fb= (FluidBakeJob *)customdata;
        
        *(fb->do_update)= 1;
        *(fb->progress)= progress;
@@ -749,7 +751,7 @@
 
 static void fluidbake_startjob(void *customdata, short *stop, short 
*do_update, float *progress)
 {
-       FluidBakeJob *fb= customdata;
+       FluidBakeJob *fb= (FluidBakeJob *)customdata;
        
        fb->stop= stop;
        fb->do_update = do_update;
@@ -764,7 +766,7 @@
 
 static void fluidbake_endjob(void *customdata)
 {
-       FluidBakeJob *fb= customdata;
+       FluidBakeJob *fb= (FluidBakeJob *)customdata;
        
        if (fb->settings) {
                MEM_freeN(fb->settings);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs