svn merge -r 15649:15800 https://svn.blender.org/svnroot/bf-blender/trunk/blender...

[blender-staging.git] / source / blender / blenkernel / intern / fluidsim.c

diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c
index 2b7d3d1964225138d7485bd01aef9efc14db283d..3b369e52c439a75b93e6417138fead9e1fd02ba2 100644 (file)
--- a/source/blender/blenkernel/intern/fluidsim.c
+++ b/source/blender/blenkernel/intern/fluidsim.c
@@ -193,6 +193,9 @@ DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Object *ob, Deri
                        {
                                return result;
                        }
+                       
+                       // it was supposed to be a valid frame but it isn't!
+                       fss->lastgoodframe = -1;
                }
                
                result = CDDM_copy(dm);