[Bf-blender-cvs] [b7b6f72cb57] hair_guides hair_guides_grooming: Merge branch 'blender2.8' into hair_guides

[Lukas Tönne]

Commit: b7b6f72cb57af13f0a0637c515a06e3831989909
Author: Lukas Tönne
Date:   Sat Jun 9 06:43:15 2018 +0100
Branches: hair_guides hair_guides_grooming
https://developer.blender.org/rBb7b6f72cb57af13f0a0637c515a06e3831989909

Merge branch 'blender2.8' into hair_guides

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



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

diff --cc source/blender/editors/object/object_modifier.c
index fb2884ea07f,1b9af3725ca..71c9cb3eb69
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@@ -64,7 -63,7 +64,8 @@@
  #include "BKE_main.h"
  #include "BKE_mesh.h"
  #include "BKE_mesh_mapping.h"
+ #include "BKE_mesh_runtime.h"
 +#include "BKE_mesh_sample.h"
  #include "BKE_modifier.h"
  #include "BKE_multires.h"
  #include "BKE_report.h"