[Bf-blender-cvs] [6db876b] alembic_pointcache: Merge branch 'master' into alembic_pointcache

[Lukas Tönne]

Commit: 6db876bef6325b81d598da0324fc48e71c52ba0f
Author: Lukas Tönne
Date:   Sat Mar 21 17:58:52 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB6db876bef6325b81d598da0324fc48e71c52ba0f

Merge branch 'master' into alembic_pointcache

===================================================================



===================================================================

diff --cc source/blender/blenkernel/BKE_mesh.h
index c88b102,1f3458c..003d3ff
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@@ -131,9 -130,11 +131,12 @@@ bool BKE_mesh_uv_cdlayer_rename(struct 
  
  float (*BKE_mesh_vertexCos_get(struct Mesh *me, int *r_numVerts))[3];
  
+ void BKE_mesh_calc_normals_split(struct Mesh *mesh);
+ void BKE_mesh_split_faces(struct Mesh *mesh);
+ 
  struct Mesh *BKE_mesh_new_from_object(struct Main *bmain, struct Scene *sce, struct Object *ob,
                                        int apply_modifiers, int settings, int calc_tessface, int calc_undeformed);
 +struct Mesh *BKE_mesh_new_from_dupli_data(struct Main *bmain, struct DupliObjectData *data, bool calc_tessface, bool calc_undeformed);
  
  /* vertex level transformations & checks (no derived mesh) */