svn merge -r 16320:16369 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / blenkernel / intern / cdderivedmesh.c
index 9d5dcb8109b12a9e3b0587574147a489f38e5988..c30d86431b13354921e8312830f53413683718d7 100644 (file)
@@ -898,10 +898,7 @@ DerivedMesh *CDDM_from_mesh(Mesh *mesh, Object *ob)
 
        dm->deformedOnly = 1;
 
-       if(ob && ob->fluidsimSettings && ob->fluidsimSettings->meshSurface)
-               alloctype= CD_DUPLICATE;
-       else
-               alloctype= CD_REFERENCE;
+       alloctype= CD_REFERENCE;
 
        CustomData_merge(&mesh->vdata, &dm->vertData, CD_MASK_MESH, alloctype,
                         mesh->totvert);