Merge branch 'blender2.8' into soc-2018-bevel

12 files changed, 13 insertions, 34 deletions

diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index 320bebc9958..bd3eb4cc1ac 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -119,9 +119,9 @@ set(SRC
 	intern/bmesh_polygon_edgenet.c
 	intern/bmesh_polygon_edgenet.h
 	intern/bmesh_private.h
-	intern/bmesh_queries.c
-	intern/bmesh_queries.h
-	intern/bmesh_queries_inline.h
+	intern/bmesh_query.c
+	intern/bmesh_query.h
+	intern/bmesh_query_inline.h
 	intern/bmesh_structure.c
 	intern/bmesh_structure.h
 	intern/bmesh_structure_inline.h
diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h
index b84a3d5e559..138b8b7c51f 100644
--- a/source/blender/bmesh/bmesh.h
+++ b/source/blender/bmesh/bmesh.h
@@ -84,7 +84,7 @@
  * Edges and Vertices in BMesh are primitive structures.
  *
  * \note There can be more than one edge between two vertices in BMesh,
- * though the rest of Blender (e.g. DerivedMesh, CDDM, CCGSubSurf, etc) does not support this.
+ * though the rest of Blender (i.e. DNA and evaluated Mesh) does not support this.
  * So it should only occur temporarily during editing operations.
  *
  *
@@ -98,7 +98,7 @@
  *
  * These are accessible through the iterator api, which is covered later in this document
  *
- * See source/blender/bmesh/bmesh_queries.h for more misc. queries.
+ * See source/blender/bmesh/bmesh_query.h for more misc. queries.
  *
  *
  * \section bm_api The BMesh API
@@ -246,7 +246,7 @@ extern "C" {
 #include "intern/bmesh_operators.h"
 #include "intern/bmesh_polygon.h"
 #include "intern/bmesh_polygon_edgenet.h"
-#include "intern/bmesh_queries.h"
+#include "intern/bmesh_query.h"
 #include "intern/bmesh_walkers.h"
 
 #include "intern/bmesh_inline.h"
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index 97f1bad08b7..bb5199fa0c8 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -36,7 +36,8 @@
 
 #include "BLT_translation.h"
 
-#include "BKE_DerivedMesh.h"
+#include "DNA_meshdata_types.h"
+
 #include "BKE_mesh.h"
 
 #include "bmesh.h"
diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h
index 43029e370c6..89077d84447 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.h
+++ b/source/blender/bmesh/intern/bmesh_mesh.h
@@ -144,22 +144,4 @@ extern const BMAllocTemplate bm_mesh_chunksize_default;
 }
 #define BMALLOC_TEMPLATE_FROM_ME(...) VA_NARGS_CALL_OVERLOAD(_VA_BMALLOC_TEMPLATE_FROM_ME_, __VA_ARGS__)
 
-#define _VA_BMALLOC_TEMPLATE_FROM_DM_1(dm) { \
-	(CHECK_TYPE_INLINE(dm, DerivedMesh *), \
-	(dm)->getNumVerts(dm)),		\
-	(dm)->getNumEdges(dm),		\
-	(dm)->getNumLoops(dm),		\
-	(dm)->getNumPolys(dm),		\
-}
-#define _VA_BMALLOC_TEMPLATE_FROM_DM_2(dm_a, dm_b) { \
-	(CHECK_TYPE_INLINE(dm_a, DerivedMesh *), \
-	 CHECK_TYPE_INLINE(dm_b, DerivedMesh *), \
-	(dm_a)->getNumVerts(dm_a)) + (dm_b)->getNumVerts(dm_b),	\
-	(dm_a)->getNumEdges(dm_a)  + (dm_b)->getNumEdges(dm_b),	\
-	(dm_a)->getNumLoops(dm_a)  + (dm_b)->getNumLoops(dm_b),	\
-	(dm_a)->getNumPolys(dm_a)  + (dm_b)->getNumPolys(dm_b),	\
-}
-
-#define BMALLOC_TEMPLATE_FROM_DM(...) VA_NARGS_CALL_OVERLOAD(_VA_BMALLOC_TEMPLATE_FROM_DM_, __VA_ARGS__)
-
 #endif /* __BMESH_MESH_H__ */
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c
index 00bb0110e74..7e1e1c53a8f 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c
@@ -550,7 +550,7 @@ BLI_INLINE void bmesh_quick_edgedraw_flag(MEdge *med, BMEdge *e)
 
 /**
  *
- * \param bmain May be NULL in case \a calc_object_remap parameter option is set.
+ * \param bmain May be NULL in case \a calc_object_remap parameter option is not set.
  */
 void BM_mesh_bm_to_me(
         Main *bmain, BMesh *bm, Mesh *me,
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index a10f2e2bb3f..dfa3486227f 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -1104,4 +1104,3 @@ BMVert *BM_face_loop_separate_multi(BMesh *bm, BMLoop **larr, int larr_len)
 {
 	return bmesh_kernel_unglue_region_make_vert_multi(bm, larr, larr_len);
 }
-
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_query.c
index 5ce4b236d03..33ad7836893 100644
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_query.c
@@ -20,7 +20,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/intern/bmesh_queries.c
+/** \file blender/bmesh/intern/bmesh_query.c
  *  \ingroup bmesh
  *
  * This file contains functions for answering common
diff --git a/source/blender/bmesh/intern/bmesh_queries.h b/source/blender/bmesh/intern/bmesh_query.h
index e602c63da94..cb3af88c316 100644
--- a/source/blender/bmesh/intern/bmesh_queries.h
+++ b/source/blender/bmesh/intern/bmesh_query.h
@@ -23,7 +23,7 @@
 #ifndef __BMESH_QUERIES_H__
 #define __BMESH_QUERIES_H__
 
-/** \file blender/bmesh/intern/bmesh_queries.h
+/** \file blender/bmesh/intern/bmesh_query.h
  *  \ingroup bmesh
  */
 
@@ -196,6 +196,6 @@ int   BM_mesh_calc_edge_groups(
 /* not really any good place  to put this */
 float bmesh_subd_falloff_calc(const int falloff, float val) ATTR_WARN_UNUSED_RESULT;
 
-#include "bmesh_queries_inline.h"
+#include "bmesh_query_inline.h"
 
 #endif /* __BMESH_QUERIES_H__ */
diff --git a/source/blender/bmesh/intern/bmesh_queries_inline.h b/source/blender/bmesh/intern/bmesh_query_inline.h
index 09cf39b526d..1bd77d23ded 100644
--- a/source/blender/bmesh/intern/bmesh_queries_inline.h
+++ b/source/blender/bmesh/intern/bmesh_query_inline.h
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/intern/bmesh_queries_inline.h
+/** \file blender/bmesh/intern/bmesh_query_inline.h
  *  \ingroup bmesh
  */
 
diff --git a/source/blender/bmesh/operators/bmo_beautify.c b/source/blender/bmesh/operators/bmo_beautify.c
index c68d92ea5e0..00b2b8a5d1b 100644
--- a/source/blender/bmesh/operators/bmo_beautify.c
+++ b/source/blender/bmesh/operators/bmo_beautify.c
@@ -82,4 +82,3 @@ void bmo_beautify_fill_exec(BMesh *bm, BMOperator *op)
 
 	BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "geom.out", BM_EDGE | BM_FACE, ELE_NEW);
 }
-
diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.c b/source/blender/bmesh/operators/bmo_smooth_laplacian.c
index 2a7b85ac8fd..317045b303c 100644
--- a/source/blender/bmesh/operators/bmo_smooth_laplacian.c
+++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.c
@@ -543,4 +543,3 @@ void bmo_smooth_laplacian_vert_exec(BMesh *bm, BMOperator *op)
 
 	delete_laplacian_system(sys);
 }
-
diff --git a/source/blender/bmesh/tools/bmesh_beautify.c b/source/blender/bmesh/tools/bmesh_beautify.c
index d3972363bb4..5d535cc7503 100644
--- a/source/blender/bmesh/tools/bmesh_beautify.c
+++ b/source/blender/bmesh/tools/bmesh_beautify.c
@@ -456,4 +456,3 @@ void BM_mesh_beautify_fill(
 	TIMEIT_END(beautify_fill);
 #endif
 }
-