merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though...
[blender-staging.git] / source / blender / editors / physics / particle_object.c
index d72357a38b16aa63f0340a4b88e5d6748314cca8..f590339b91d3f52b9fc714d003dc5c7ffc0d1a7c 100644 (file)
@@ -660,7 +660,7 @@ static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
                        continue;
                }
 
-               mface = CDDM_get_face(dm,nearest.index);
+               mface = CDDM_get_tessface(dm,nearest.index);
 
                copy_v3_v3(v[0], CDDM_get_vert(dm,mface->v1)->co);
                copy_v3_v3(v[1], CDDM_get_vert(dm,mface->v2)->co);