[Bf-blender-cvs] [d92bd5746dd] soc-2017-normal-tools: Merge branch 'master' into soc-2017-normal-tools

[Bastien Montagne]

Commit: d92bd5746dd3cda9ca4485341276c227e2f52926
Author: Bastien Montagne
Date:   Thu Mar 1 17:02:01 2018 +0100
Branches: soc-2017-normal-tools
https://developer.blender.org/rBd92bd5746dd3cda9ca4485341276c227e2f52926

Merge branch 'master' into soc-2017-normal-tools

Conflicts:
	source/blender/blenkernel/BKE_mesh.h

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



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

diff --cc source/blender/bmesh/intern/bmesh_mesh.h
index 2b2f9058954,10f024423aa..98439c8b4a1
--- a/source/blender/bmesh/intern/bmesh_mesh.h
+++ b/source/blender/bmesh/intern/bmesh_mesh.h
@@@ -51,23 -50,11 +51,26 @@@ void BM_verts_calc_normal_vcos(BMesh *b
  void BM_loops_calc_normal_vcos(
          BMesh *bm, const float (*vcos)[3], const float (*vnos)[3], const float (*pnos)[3],
          const bool use_split_normals, const float split_angle, float (*r_lnos)[3],
 -        struct MLoopNorSpaceArray *r_lnors_spacearr, short (*clnors_data)[2], const int cd_loop_clnors_offset);
 +        struct MLoopNorSpaceArray *r_lnors_spacearr, short (*clnors_data)[2],
 +        const int cd_loop_clnors_offset, const bool do_rebuild);
 +
 +bool BM_loop_check_cyclic_smooth_fan(BMLoop *l_curr);
 +void BM_lnorspacearr_store(BMesh *bm, float (*r_lnors)[3]);
 +void BM_lnorspace_invalidate(BMesh *bm, const bool do_invalidate_all);
 +void BM_lnorspace_rebuild(BMesh *bm, bool preserve_clnor);
 +void BM_lnorspace_update(BMesh *bm);
 +#ifndef NDEBUG
 +void BM_lnorspace_err(BMesh *bm);
 +#endif
 +
 +/* Loop Generics */
 +struct BMLoopNorEditDataArray *BM_loop_normal_editdata_init(BMesh *bm);
 +void BM_loop_normal_editdata_free(struct BMLoopNorEditDataArray *ld);
 +int BM_total_loop_select(BMesh *bm);
  
+ bool BM_loop_check_cyclic_smooth_fan(BMLoop *l_curr);
+ 
+ 
  void BM_edges_sharp_from_angle_set(BMesh *bm, const float split_angle);
  
  void bmesh_edit_begin(BMesh *bm, const BMOpTypeFlag type_flag);