Merge branch 'master' into blender2.8

1 files changed, 17 insertions, 16 deletions

diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 9e7b4ed8b6f..ef36b5ac6bd 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -41,10 +41,11 @@ set(INC_SYS
 set(SRC
 	intern/BLI_args.c
 	intern/BLI_array.c
-	intern/BLI_dial.c
+	intern/BLI_dial_2d.c
 	intern/BLI_dynstr.c
 	intern/BLI_filelist.c
 	intern/BLI_ghash.c
+	intern/BLI_ghash_utils.c
 	intern/BLI_heap.c
 	intern/BLI_kdopbvh.c
 	intern/BLI_kdtree.c
@@ -58,10 +59,10 @@ set(SRC
 	intern/array_utils.c
 	intern/astar.c
 	intern/bitmap_draw_2d.c
-	intern/boxpack2d.c
+	intern/boxpack_2d.c
 	intern/buffer.c
 	intern/callbacks.c
-	intern/convexhull2d.c
+	intern/convexhull_2d.c
 	intern/dynlib.c
 	intern/easing.c
 	intern/edgehash.c
@@ -73,8 +74,8 @@ set(SRC
 	intern/gsqueue.c
 	intern/hash_md5.c
 	intern/hash_mm2a.c
-	intern/jitter.c
-	intern/lasso.c
+	intern/jitter_2d.c
+	intern/lasso_2d.c
 	intern/list_sort_impl.h
 	intern/listbase.c
 	intern/math_base.c
@@ -95,8 +96,8 @@ set(SRC
 	intern/memory_utils.c
 	intern/noise.c
 	intern/path_util.c
-	intern/polyfill2d.c
-	intern/polyfill2d_beautify.c
+	intern/polyfill_2d.c
+	intern/polyfill_2d_beautify.c
 	intern/quadric.c
 	intern/rand.c
 	intern/rct.c
@@ -117,7 +118,7 @@ set(SRC
 	intern/time.c
 	intern/timecode.c
 	intern/uvproject.c
-	intern/voronoi.c
+	intern/voronoi_2d.c
 	intern/voxel.c
 	intern/winstuff.c
 	intern/winstuff_dir.c
@@ -132,14 +133,14 @@ set(SRC
 	BLI_bitmap.h
 	BLI_bitmap_draw_2d.h
 	BLI_blenlib.h
-	BLI_boxpack2d.h
+	BLI_boxpack_2d.h
 	BLI_buffer.h
 	BLI_callbacks.h
 	BLI_compiler_attrs.h
 	BLI_compiler_compat.h
 	BLI_compiler_typecheck.h
-	BLI_convexhull2d.h
-	BLI_dial.h
+	BLI_convexhull_2d.h
+	BLI_dial_2d.h
 	BLI_dlrbTree.h
 	BLI_dynlib.h
 	BLI_dynstr.h
@@ -158,10 +159,10 @@ set(SRC
 	BLI_hash_mm2a.h
 	BLI_heap.h
 	BLI_iterator.h
-	BLI_jitter.h
+	BLI_jitter_2d.h
 	BLI_kdopbvh.h
 	BLI_kdtree.h
-	BLI_lasso.h
+	BLI_lasso_2d.h
 	BLI_link_utils.h
 	BLI_linklist.h
 	BLI_linklist_stack.h
@@ -185,8 +186,8 @@ set(SRC
 	BLI_mempool.h
 	BLI_noise.h
 	BLI_path_util.h
-	BLI_polyfill2d.h
-	BLI_polyfill2d_beautify.h
+	BLI_polyfill_2d.h
+	BLI_polyfill_2d_beautify.h
 	BLI_quadric.h
 	BLI_rand.h
 	BLI_rect.h
@@ -211,7 +212,7 @@ set(SRC
 	BLI_utildefines_variadic.h
 	BLI_uvproject.h
 	BLI_vfontdata.h
-	BLI_voronoi.h
+	BLI_voronoi_2d.h
 	BLI_voxel.h
 	BLI_winstuff.h
 	PIL_time.h