Cleanup: add 2d suffix to BLI files
authorCampbell Barton <ideasman42@gmail.com>
Sun, 18 Feb 2018 10:27:33 +0000 (21:27 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 18 Feb 2018 10:27:33 +0000 (21:27 +1100)
Some of these API's can have 3D versions, explicitly name them 2D.

53 files changed:
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/mesh_remap.c
source/blender/blenkernel/intern/particle_distribute.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/BLI_boxpack_2d.h [moved from source/blender/blenlib/BLI_boxpack2d.h with 91% similarity]
source/blender/blenlib/BLI_convexhull_2d.h [moved from source/blender/blenlib/BLI_convexhull2d.h with 89% similarity]
source/blender/blenlib/BLI_dial_2d.h [moved from source/blender/blenlib/BLI_dial.h with 94% similarity]
source/blender/blenlib/BLI_jitter_2d.h [moved from source/blender/blenlib/BLI_jitter.h with 91% similarity]
source/blender/blenlib/BLI_lasso_2d.h [moved from source/blender/blenlib/BLI_lasso.h with 92% similarity]
source/blender/blenlib/BLI_polyfill_2d.h [moved from source/blender/blenlib/BLI_polyfill2d.h with 93% similarity]
source/blender/blenlib/BLI_polyfill_2d_beautify.h [moved from source/blender/blenlib/BLI_polyfill2d_beautify.h with 100% similarity]
source/blender/blenlib/BLI_voronoi_2d.h [moved from source/blender/blenlib/BLI_voronoi.h with 98% similarity]
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/BLI_dial_2d.c [moved from source/blender/blenlib/intern/BLI_dial.c with 96% similarity]
source/blender/blenlib/intern/boxpack_2d.c [moved from source/blender/blenlib/intern/boxpack2d.c with 99% similarity]
source/blender/blenlib/intern/convexhull_2d.c [moved from source/blender/blenlib/intern/convexhull2d.c with 99% similarity]
source/blender/blenlib/intern/jitter_2d.c [moved from source/blender/blenlib/intern/jitter.c with 99% similarity]
source/blender/blenlib/intern/lasso_2d.c [moved from source/blender/blenlib/intern/lasso.c with 96% similarity]
source/blender/blenlib/intern/polyfill_2d.c [moved from source/blender/blenlib/intern/polyfill2d.c with 99% similarity]
source/blender/blenlib/intern/polyfill_2d_beautify.c [moved from source/blender/blenlib/intern/polyfill2d_beautify.c with 99% similarity]
source/blender/blenlib/intern/voronoi_2d.c [moved from source/blender/blenlib/intern/voronoi.c with 99% similarity]
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/bmesh/operators/bmo_connect_concave.c
source/blender/bmesh/tools/bmesh_beautify.c
source/blender/bmesh/tools/bmesh_decimate_collapse.c
source/blender/bmesh/tools/bmesh_triangulate.c
source/blender/compositor/operations/COM_KeyingScreenOperation.h
source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/gpencil/gpencil_select.c
source/blender/editors/mask/mask_select.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_mask.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_action/action_select.c
source/blender/editors/space_clip/tracking_select.c
source/blender/editors/space_graph/graph_select.c
source/blender/editors/space_node/node_select.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_parametrizer.c
source/blender/python/mathutils/mathutils_bvhtree.c
source/blender/python/mathutils/mathutils_geometry.c
source/blender/render/intern/source/initrender.c
source/blender/render/intern/source/shadbuf.c
source/blender/render/intern/source/zbuf.c
source/blender/windowmanager/intern/wm_gesture.c
source/blender/windowmanager/intern/wm_operators.c
tests/gtests/blenlib/BLI_polyfill_2d_test.cc [moved from tests/gtests/blenlib/BLI_polyfill2d_test.cc with 99% similarity]
tests/gtests/blenlib/CMakeLists.txt

index be8fcaa..ffa7fdc 100644 (file)
@@ -44,7 +44,7 @@
 #include "atomic_ops.h"
 
 #include "BLI_math.h"
-#include "BLI_jitter.h"
+#include "BLI_jitter_2d.h"
 #include "BLI_bitmap.h"
 #include "BLI_task.h"
 
index b0c0997..9133104 100644 (file)
@@ -43,7 +43,7 @@
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
 #include "BLI_bitmap.h"
-#include "BLI_polyfill2d.h"
+#include "BLI_polyfill_2d.h"
 #include "BLI_linklist.h"
 #include "BLI_linklist_stack.h"
 #include "BLI_alloca.h"
index f321c94..0af4dae 100644 (file)
@@ -36,7 +36,7 @@
 #include "BLI_bitmap.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
-#include "BLI_polyfill2d.h"
+#include "BLI_polyfill_2d.h"
 #include "BLI_rand.h"
 
 #include "BKE_bvhutils.h"
index 9a79808..81a5874 100644 (file)
@@ -36,7 +36,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_jitter.h"
+#include "BLI_jitter_2d.h"
 #include "BLI_kdtree.h"
 #include "BLI_math.h"
 #include "BLI_math_geom.h"
index 7851cd5..e4dcf66 100644 (file)
@@ -58,7 +58,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_edgehash.h"
 #include "BLI_rand.h"
-#include "BLI_jitter.h"
+#include "BLI_jitter_2d.h"
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_kdtree.h"
similarity index 91%
rename from source/blender/blenlib/BLI_boxpack2d.h
rename to source/blender/blenlib/BLI_boxpack_2d.h
index b02e342..80e89bd 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BLI_BOXPACK2D_H__
-#define __BLI_BOXPACK2D_H__
+#ifndef __BLI_BOXPACK_2D_H__
+#define __BLI_BOXPACK_2D_H__
 
-/** \file BLI_boxpack2d.h
+/** \file BLI_boxpack_2d.h
  *  \ingroup bli
  */
 
@@ -39,7 +39,7 @@ typedef struct BoxPack {
        float y;
        float w;
        float h;
-       
+
        /* Verts this box uses
         * (BL,TR,TL,BR) / 0,1,2,3 */
        struct BoxVert *v[4];
@@ -49,5 +49,5 @@ typedef struct BoxPack {
 
 void BLI_box_pack_2d(BoxPack *boxarray, const unsigned int len, float *tot_width, float *tot_height);
 
-#endif
+#endif  /* __BLI_BOXPACK_2D_H__ */
 
similarity index 89%
rename from source/blender/blenlib/BLI_convexhull2d.h
rename to source/blender/blenlib/BLI_convexhull_2d.h
index 4b82071..000d28a 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BLI_CONVEXHULL2D_H__
-#define __BLI_CONVEXHULL2D_H__
+#ifndef __BLI_CONVEXHULL_2D_H__
+#define __BLI_CONVEXHULL_2D_H__
 
-/** \file BLI_convexhull2d.h
+/** \file BLI_convexhull_2d.h
  *  \ingroup bli
  */
 
@@ -31,4 +31,4 @@ int BLI_convexhull_2d(const float (*points)[2], const int n, int r_points[]);
 float BLI_convexhull_aabb_fit_hull_2d(const float (*points_hull)[2], unsigned int n);
 float BLI_convexhull_aabb_fit_points_2d(const float (*points)[2], unsigned int n);
 
-#endif  /* __BLI_CONVEXHULL2D_H__ */
+#endif  /* __BLI_CONVEXHULL_2D_H__ */
similarity index 94%
rename from source/blender/blenlib/BLI_dial.h
rename to source/blender/blenlib/BLI_dial_2d.h
index 71ab57b..dbd71a8 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BLI_DIAL_H__
-#define __BLI_DIAL_H__
+#ifndef __BLI_DIAL_2D_H__
+#define __BLI_DIAL_2D_H__
 
-/** \file BLI_dial.h
+/** \file BLI_dial_2d.h
  *  \ingroup bli
  *
  * \note dials act similar to old rotation based phones and output an angle.
@@ -56,4 +56,4 @@ Dial *BLI_dial_initialize(const float start_position[2], float threshold);
 
 float BLI_dial_angle(Dial *dial, const float current_position[2]);
 
-#endif /* __BLI_DIAL_H__ */
+#endif  /* __BLI_DIAL_2D_H__ */
similarity index 91%
rename from source/blender/blenlib/BLI_jitter.h
rename to source/blender/blenlib/BLI_jitter_2d.h
index 769fb44..e2b1f21 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BLI_JITTER_H__
-#define __BLI_JITTER_H__ 
+#ifndef __BLI_JITTER_2D_H__
+#define __BLI_JITTER_2D_H__
 
-/** \file BLI_jitter.h
+/** \file BLI_jitter_2d.h
  *  \ingroup bli
  */
 
@@ -36,5 +36,5 @@ void BLI_jitter_init(float (*jitarr)[2], int num);
 void BLI_jitterate1(float (*jit1)[2], float (*jit2)[2], int num, float radius1);
 void BLI_jitterate2(float (*jit1)[2], float (*jit2)[2], int num, float radius2);
 
-#endif
+#endif  /* __BLI_JITTER_2D_H__ */
 
similarity index 92%
rename from source/blender/blenlib/BLI_lasso.h
rename to source/blender/blenlib/BLI_lasso_2d.h
index 28f21e5..3644224 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BLI_LASSO_H__
-#define __BLI_LASSO_H__
+#ifndef __BLI_LASSO_2D_H__
+#define __BLI_LASSO_2D_H__
 
-/** \file BLI_lasso.h
+/** \file BLI_lasso_2d.h
  *  \ingroup bli
  */
 
@@ -38,4 +38,4 @@ void BLI_lasso_boundbox(struct rcti *rect, const int mcords[][2], const unsigned
 bool BLI_lasso_is_point_inside(const int mcords[][2], const unsigned int moves, const int sx, const int sy, const int error_value);
 bool BLI_lasso_is_edge_inside(const int mcords[][2], const unsigned int moves, int x0, int y0, int x1, int y1, const int error_value);
 
-#endif
+#endif  /* __BLI_LASSO_2D_H__ */
similarity index 93%
rename from source/blender/blenlib/BLI_polyfill2d.h
rename to source/blender/blenlib/BLI_polyfill_2d.h
index 798055f..099f08d 100644 (file)
@@ -18,8 +18,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BLI_POLYFILL2D_H__
-#define __BLI_POLYFILL2D_H__
+#ifndef __BLI_POLYFILL_2D_H__
+#define __BLI_POLYFILL_2D_H__
 
 struct MemArena;
 
@@ -40,4 +40,4 @@ void BLI_polyfill_calc(
 /* default size of polyfill arena */
 #define BLI_POLYFILL_ARENA_SIZE MEM_SIZE_OPTIMAL(1 << 14)
 
-#endif  /* __BLI_POLYFILL2D_H__ */
+#endif  /* __BLI_POLYFILL_2D_H__ */
similarity index 98%
rename from source/blender/blenlib/BLI_voronoi.h
rename to source/blender/blenlib/BLI_voronoi_2d.h
index 9d32061..51d1d5a 100644 (file)
@@ -28,7 +28,7 @@
 
 struct ListBase;
 
-/** \file BLI_voronoi.h
+/** \file BLI_voronoi_2d.h
  *  \ingroup bli
  */
 
index 61a1241..edfa223 100644 (file)
@@ -41,7 +41,7 @@ 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
@@ -57,10 +57,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
@@ -72,8 +72,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
@@ -94,8 +94,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
@@ -116,7 +116,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
@@ -131,14 +131,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
@@ -156,10 +156,10 @@ set(SRC
        BLI_hash_md5.h
        BLI_hash_mm2a.h
        BLI_heap.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
@@ -182,8 +182,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
@@ -208,7 +208,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
similarity index 96%
rename from source/blender/blenlib/intern/BLI_dial.c
rename to source/blender/blenlib/intern/BLI_dial_2d.c
index 89f18fa..d31367c 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "BLI_dial.h"
+/** \file blender/blenlib/intern/BLI_dial_2d.c
+ *  \ingroup bli
+ */
+
+#include "BLI_dial_2d.h"
 #include "BLI_math.h"
 
 #include "MEM_guardedalloc.h"
similarity index 99%
rename from source/blender/blenlib/intern/boxpack2d.c
rename to source/blender/blenlib/intern/boxpack_2d.c
index ff17d2a..b3beff0 100644 (file)
@@ -30,7 +30,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_boxpack2d.h"  /* own include */
+#include "BLI_boxpack_2d.h"  /* own include */
 
 #include "BLI_sort.h"  /* qsort_r */
 #define qsort_r  BLI_qsort_r
similarity index 99%
rename from source/blender/blenlib/intern/convexhull2d.c
rename to source/blender/blenlib/intern/convexhull_2d.c
index 1f1f214..38928db 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/blenlib/intern/convexhull2d.c
+/** \file blender/blenlib/intern/convexhull_2d.c
  *  \ingroup bli
  */
 
@@ -28,7 +28,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_convexhull2d.h"
+#include "BLI_convexhull_2d.h"
 #include "BLI_math.h"
 #include "BLI_strict_flags.h"
 #include "BLI_utildefines.h"
similarity index 99%
rename from source/blender/blenlib/intern/jitter.c
rename to source/blender/blenlib/intern/jitter_2d.c
index bc2b567..6c51eeb 100644 (file)
@@ -35,7 +35,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_rand.h"
-#include "BLI_jitter.h"
+#include "BLI_jitter_2d.h"
 
 #include "BLI_strict_flags.h"
 
similarity index 96%
rename from source/blender/blenlib/intern/lasso.c
rename to source/blender/blenlib/intern/lasso_2d.c
index 710da09..663f3ff 100644 (file)
@@ -26,7 +26,7 @@
  *
  */
 
-/** \file blender/blenlib/intern/lasso.c
+/** \file blender/blenlib/intern/lasso_2d.c
  *  \ingroup bli
  */
 
@@ -35,7 +35,7 @@
 #include "BLI_math.h"
 #include "BLI_strict_flags.h"
 
-#include "BLI_lasso.h" /* own include */
+#include "BLI_lasso_2d.h" /* own include */
 
 void BLI_lasso_boundbox(rcti *rect, const int mcords[][2], const unsigned int moves)
 {
similarity index 99%
rename from source/blender/blenlib/intern/polyfill2d.c
rename to source/blender/blenlib/intern/polyfill_2d.c
index 018e2f9..8c0870f 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/blenlib/intern/polyfill2d.c
+/** \file blender/blenlib/intern/polyfill_2d.c
  *  \ingroup bli
  *
  * An ear clipping algorithm to triangulate single boundary polygons.
@@ -53,7 +53,7 @@
 #include "BLI_memarena.h"
 #include "BLI_alloca.h"
 
-#include "BLI_polyfill2d.h"  /* own include */
+#include "BLI_polyfill_2d.h"  /* own include */
 
 #include "BLI_strict_flags.h"
 
@@ -44,7 +44,7 @@
 #include "BLI_memarena.h"
 #include "BLI_heap.h"
 
-#include "BLI_polyfill2d_beautify.h"  /* own include */
+#include "BLI_polyfill_2d_beautify.h"  /* own include */
 
 #include "BLI_strict_flags.h"
 
similarity index 99%
rename from source/blender/blenlib/intern/voronoi.c
rename to source/blender/blenlib/intern/voronoi_2d.c
index e0cbe27..40e98d5 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/*
+/** \file blender/blenlib/intern/voronoi_2d.c
+ *  \ingroup bli
+ *
  * Fortune's algorithm implemented using explanation and some code snippets from
  * http://blog.ivank.net/fortunes-algorithm-and-implementation.html
  */
 
-/** \file blender/blenlib/intern/voronoi.c
- *  \ingroup bli
- */
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
 #include "BLI_math.h"
-#include "BLI_voronoi.h"
+#include "BLI_voronoi_2d.h"
 #include "BLI_utildefines.h"
 
 #define VORONOI_EPS 1e-2f
index 66d0a83..bcb940f 100644 (file)
@@ -36,8 +36,8 @@
 #include "BLI_alloca.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
-#include "BLI_polyfill2d.h"
-#include "BLI_polyfill2d_beautify.h"
+#include "BLI_polyfill_2d.h"
+#include "BLI_polyfill_2d_beautify.h"
 #include "BLI_linklist.h"
 #include "BLI_edgehash.h"
 #include "BLI_heap.h"
index 8077432..d1811ac 100644 (file)
@@ -39,8 +39,8 @@
 #include "BLI_alloca.h"
 #include "BLI_memarena.h"
 #include "BLI_heap.h"
-#include "BLI_polyfill2d.h"
-#include "BLI_polyfill2d_beautify.h"
+#include "BLI_polyfill_2d.h"
+#include "BLI_polyfill_2d_beautify.h"
 #include "BLI_linklist.h"
 
 #include "bmesh.h"
index 81f0b48..d397236 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "BLI_math.h"
 #include "BLI_heap.h"
-#include "BLI_polyfill2d_beautify.h"
+#include "BLI_polyfill_2d_beautify.h"
 
 #include "MEM_guardedalloc.h"
 
index 3aa9e52..c1b2bc2 100644 (file)
@@ -38,8 +38,8 @@
 #include "BLI_alloca.h"
 #include "BLI_memarena.h"
 #include "BLI_edgehash.h"
-#include "BLI_polyfill2d.h"
-#include "BLI_polyfill2d_beautify.h"
+#include "BLI_polyfill_2d.h"
+#include "BLI_polyfill_2d_beautify.h"
 #include "BLI_utildefines_stack.h"
 
 
index bd201fa..a3a3355 100644 (file)
@@ -38,8 +38,8 @@
 #include "BLI_linklist.h"
 
 /* only for defines */
-#include "BLI_polyfill2d.h"
-#include "BLI_polyfill2d_beautify.h"
+#include "BLI_polyfill_2d.h"
+#include "BLI_polyfill_2d_beautify.h"
 
 #include "bmesh.h"
 
index 1145abd..75a85ad 100644 (file)
@@ -28,7 +28,7 @@ extern "C" {
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_math_color.h"
-#include "BLI_jitter.h"
+#include "BLI_jitter_2d.h"
 
 #include "BKE_movieclip.h"
 #include "BKE_node.h"
index 9d25fc9..0ef6aa4 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 #include "BLI_math.h"
 
 #include "DNA_anim_types.h"
index 100e2dc..b23b9a0 100644 (file)
@@ -41,7 +41,7 @@
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_polyfill2d.h"
+#include "BLI_polyfill_2d.h"
 
 #include "BLF_api.h"
 #include "BLT_translation.h"
index 07abab8..dc34831 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 #include "BLI_utildefines.h"
 #include "BLI_math_vector.h"
 
index 9f2f6de..7ffd82e 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_rect.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 #include "BLI_math.h"
 
 #include "BKE_context.h"
index da66ec4..1cbc6aa 100644 (file)
@@ -45,7 +45,7 @@
 #include "DNA_space_types.h"
 
 #include "BLI_math.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "BLI_kdtree.h"
index 264135d..9d96098 100644 (file)
@@ -41,7 +41,7 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_geom.h"
 #include "BLI_utildefines.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 #include "BLI_task.h"
 
 #include "BKE_pbvh.h"
index d631a23..67cd6e4 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_dial.h"
+#include "BLI_dial_2d.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
index 110c4d1..3c3a71d 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_dlrbTree.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
index 4ee85ac..ecbc1f5 100644 (file)
@@ -37,7 +37,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_math.h"
 #include "BLI_rect.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 
 #include "BKE_context.h"
 #include "BKE_tracking.h"
index 392db4e..0b7ce7d 100644 (file)
@@ -37,7 +37,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_screen_types.h"
index dc7863b..4b4add0 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_rect.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
index cdbb57c..f999fab 100644 (file)
@@ -48,7 +48,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_jitter.h"
+#include "BLI_jitter_2d.h"
 #include "BLI_utildefines.h"
 #include "BLI_endian_switch.h"
 #include "BLI_threads.h"
index 05cf552..82c239e 100644 (file)
@@ -48,7 +48,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 #include "BLI_rect.h"
 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
index 522640e..928a0fc 100644 (file)
@@ -49,7 +49,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_alloca.h"
 #include "BLI_math.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 #include "BLI_blenlib.h"
 #include "BLI_array.h"
 
index f8a93bd..c510c12 100644 (file)
@@ -32,8 +32,8 @@
 #include "BLI_math.h"
 #include "BLI_rand.h"
 #include "BLI_heap.h"
-#include "BLI_boxpack2d.h"
-#include "BLI_convexhull2d.h"
+#include "BLI_boxpack_2d.h"
+#include "BLI_convexhull_2d.h"
 
 #include "uvedit_parametrizer.h"
 
index 22e7bf3..c044cc5 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_kdopbvh.h"
-#include "BLI_polyfill2d.h"
+#include "BLI_polyfill_2d.h"
 #include "BLI_math.h"
 #include "BLI_ghash.h"
 #include "BLI_memarena.h"
index 72f92d2..fa0d271 100644 (file)
@@ -34,8 +34,8 @@
 #ifndef MATH_STANDALONE /* define when building outside blender */
 #  include "MEM_guardedalloc.h"
 #  include "BLI_blenlib.h"
-#  include "BLI_boxpack2d.h"
-#  include "BLI_convexhull2d.h"
+#  include "BLI_boxpack_2d.h"
+#  include "BLI_convexhull_2d.h"
 #  include "BKE_displist.h"
 #  include "BKE_curve.h"
 #endif
index fbf1840..ce3331e 100644 (file)
@@ -38,7 +38,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_jitter.h"
+#include "BLI_jitter_2d.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_camera_types.h"
index 7c62bf4..fb44166 100644 (file)
@@ -40,7 +40,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_jitter.h"
+#include "BLI_jitter_2d.h"
 #include "BLI_memarena.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
index 1481e7a..14184f4 100644 (file)
@@ -42,7 +42,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_jitter.h"
+#include "BLI_jitter_2d.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
index b63962f..1a4381a 100644 (file)
@@ -41,7 +41,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_lasso.h"
+#include "BLI_lasso_2d.h"
 
 #include "BKE_context.h"
 
index 4674df9..744f6cf 100644 (file)
@@ -58,7 +58,7 @@
 #include "PIL_time.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_dial.h"
+#include "BLI_dial_2d.h"
 #include "BLI_dynstr.h" /*for WM_operator_pystring */
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
similarity index 99%
rename from tests/gtests/blenlib/BLI_polyfill2d_test.cc
rename to tests/gtests/blenlib/BLI_polyfill_2d_test.cc
index 01ab400..a8c7eff 100644 (file)
@@ -12,7 +12,7 @@
 extern "C" {
 #include "BLI_utildefines.h"
 #include "BLI_array_utils.h"
-#include "BLI_polyfill2d.h"
+#include "BLI_polyfill_2d.h"
 #include "BLI_edgehash.h"
 #include "BLI_math.h"
 #include "MEM_guardedalloc.h"
@@ -22,7 +22,7 @@ extern "C" {
 #endif
 
 #ifdef USE_BEAUTIFY
-#include "BLI_polyfill2d_beautify.h"
+#include "BLI_polyfill_2d_beautify.h"
 #include "BLI_memarena.h"
 #include "BLI_heap.h"
 #endif
index 715b689..cc1c95b 100644 (file)
@@ -52,7 +52,7 @@ BLENDER_TEST(BLI_math_base "bf_blenlib")
 BLENDER_TEST(BLI_math_color "bf_blenlib")
 BLENDER_TEST(BLI_math_geom "bf_blenlib")
 BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
-BLENDER_TEST(BLI_polyfill2d "bf_blenlib")
+BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
 BLENDER_TEST(BLI_stack "bf_blenlib")
 BLENDER_TEST(BLI_string "bf_blenlib")
 BLENDER_TEST(BLI_string_utf8 "bf_blenlib")