svn merge -r 16593:16648 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 11e61989dfa36dcb8979fd2505e7aa15096fc788..7f4910a976505527ba2830d4b2d1dfa7c4534e1f 100644 (file)
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -2031,12 +2031,6 @@ static void dag_object_time_update_flags(Object *ob)
                                                ob->shapeflag &= ~OB_SHAPE_TEMPLOCK;
                                        }
                                }
-                               if((ob->fluidsimFlag & OB_FLUIDSIM_ENABLE) && (ob->fluidsimSettings)) {
-                                       // fluidsimSettings might not be initialized during load...
-                                       if(ob->fluidsimSettings->type & (OB_FLUIDSIM_DOMAIN|OB_FLUIDSIM_PARTICLE)) {
-                                               ob->recalc |= OB_RECALC_DATA; // NT FSPARTICLE
-                                       }
-                               }
                                if(ob->particlesystem.first)
                                        ob->recalc |= OB_RECALC_DATA;
                                break;