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

[Sergey Sharybin]

Commit: f046af4d5d5ed68282ae81aed4844f31daae00cb
Author: Sergey Sharybin
Date:   Mon Nov 27 16:23:32 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBf046af4d5d5ed68282ae81aed4844f31daae00cb

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/mesh/editmesh_utils.c
index 230f46abad1,44aca23e2cc..27fe93b049a
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@@ -51,9 -52,7 +51,9 @@@
  #include "BKE_editmesh.h"
  #include "BKE_editmesh_bvh.h"
  
 +#include "DEG_depsgraph.h"
 +
- #include "BKE_object.h"  /* XXX. only for EDBM_mesh_ensure_valid_dm_hack() which will be removed */
+ #include "BKE_object.h"  /* XXX. only for EDBM_mesh_load(). */
  
  #include "WM_api.h"
  #include "WM_types.h"