svn merge -r 16454:16593 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / blenkernel / intern / depsgraph.c
index d958c43aa40a276175f5fc1a4fb5a69ebfa03e71..96ea4fced9d8d67dbd73c0282d2ce0aef0a4453f 100644 (file)
@@ -1969,12 +1969,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;