Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Nov 2017 15:23:32 +0000 (16:23 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Nov 2017 15:23:32 +0000 (16:23 +0100)
1  2 
source/blender/editors/include/ED_mesh.h
source/blender/editors/mesh/editmesh_loopcut.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/makesdna/DNA_ID.h

index 230f46abad19d17daf68db908aab701479e03e36,44aca23e2cc0c57eb8d857babb2c79e323c76e59..27fe93b049ade1371d20d6ed4b15ff6bff8436e5
@@@ -51,9 -52,7 +51,9 @@@
  #include "BKE_editmesh.h"
  #include "BKE_editmesh_bvh.h"
  
- #include "BKE_object.h"  /* XXX. only for EDBM_mesh_ensure_valid_dm_hack() which will be removed */
 +#include "DEG_depsgraph.h"
 +
+ #include "BKE_object.h"  /* XXX. only for EDBM_mesh_load(). */
  
  #include "WM_api.h"
  #include "WM_types.h"
Simple merge