[Bf-blender-cvs] [79111f92463] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 79111f92463c05f05d3765bff2b3c15b56df0731
Author: Campbell Barton
Date:   Sun Aug 27 00:51:54 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB79111f92463c05f05d3765bff2b3c15b56df0731

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/bmesh/intern/bmesh_mesh_conv.c
index 49f055e1827,b340bc1a55c..025377b04aa
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c
@@@ -197,9 -233,9 +197,9 @@@ void BM_mesh_bm_from_me
  	KeyBlock *actkey, *block;
  	BMVert *v, **vtable = NULL;
  	BMEdge *e, **etable = NULL;
- 	BMFace *f;
+ 	BMFace *f, **ftable = NULL;
  	float (*keyco)[3] = NULL;
 -	int totuv, totloops, i, j;
 +	int totloops, i, j;
  
  	/* free custom data */
  	/* this isnt needed in most cases but do just incase */