Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 26 Aug 2017 14:51:54 +0000 (00:51 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 26 Aug 2017 14:51:54 +0000 (00:51 +1000)
1  2 
intern/cycles/blender/blender_mesh.cpp
source/blender/blenkernel/intern/library_remap.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/editors/space_outliner/outliner_edit.c

index 49f055e1827ad72d6c47f77dd11569fb3ebb896d,b340bc1a55cac810c095a819625e32090b45c977..025377b04aa26e0d6d7617bd4f00fba8a4e99932
@@@ -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 */