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 be8fcaa6863fbb8f056bcbdc3015a364727c8fac..ffa7fdc3ec95164634b4c3866d99cc4ec90072cf 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 b0c09979de954678a6a55a5a83767775cd03a42c..91331043be43597b4cf211c16a079e215368a5f5 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 f321c94bf0090ce1fcb35de27cf7954bacd270df..0af4dae45065fbeabfda878d8f3770f8ac6adca7 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 9a7980827ad615689c4b0472bed4b073c03d53db..81a5874ef4c1a8acc6671008949925c128983080 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 7851cd5e801a07f7e6b4ffedc41121b7eabb979e..e4dcf6618fa5fff5e8cb71f26360f0109977232f 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 b02e3423f88135071d2c663937c8bcdaf8902195..80e89bdb04fe9fe1a68a94c68acbe0f9a418ed22 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 4b82071ede82cb08e3a1e317a0f5acc68f8585eb..000d28acdde28d497d8295a3accde6518cf3f3e2 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 71ab57bb61a1e996ecd114cd4781b706992d3376..dbd71a8ad3f871613d31129c4d667e04dbf67852 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 769fb4456784bac24059e3c4b042f68a52a22872..e2b1f21800c9c644f50af57c2244dcab1852be97 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 28f21e5bd8505de7ab2ee69858e74882e0293af0..3644224f1d7375018b21230be40ce4d4cd191c9e 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 798055f9240ace07fa897a32d04164f7a10bb07c..099f08d4663ae34cee8dcc6fc893581e4daab543 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 9d32061bf97c05b59a185323a9a64f212c8a87db..51d1d5aa88e396d88738ed3d0edbc27fd7d5d802 100644 (file)
@@ -28,7 +28,7 @@
 
 struct ListBase;
 
-/** \file BLI_voronoi.h
+/** \file BLI_voronoi_2d.h
  *  \ingroup bli
  */
 
index 61a1241cd8f0727df3e1e4c523c3ecb68d5653d7..edfa2239d0a45f195014a7498d0e439fc93ef1a4 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 89f18fa10b4acc7b9f2c435de715da991c131f87..d31367c5e87e1812acec092797dff6b7fb8cd8bc 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 ff17d2ac28bf6f3d1a207d20ea83478c1cb8ecff..b3beff0b78b22cfa5a02284f3b626621353c9e3b 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 1f1f214ce3271c9e744ea154b8926651b19a989c..38928dbbaa01fa5507e4b57c9421c21e7c9a781b 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 bc2b5677fa567f86659938759886d748d2f01e95..6c51eeb36d93bf2c0c8847cdf348effc0d50080c 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 710da09521a2afc14be486e6476f05b4a0dfb0f6..663f3ffea2222cce9985224cfe479c7ba15c14f0 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 018e2f9be5aa59012bcc98bf542895cd1dfcefed..8c0870f0c07eaf334b21ebb6b478b581389d7836 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"
 
similarity index 99%
rename from source/blender/blenlib/intern/polyfill2d_beautify.c
rename to source/blender/blenlib/intern/polyfill_2d_beautify.c
index 625c54d0e9bce3d8753a15aabe687187bdd5ee30..93bfb02bce449fe69e3bce768e887174315563d4 100644 (file)
@@ -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 e0cbe278ffb4e0bc837d135e06dd99d075c51053..40e98d5914c4d2b9c659214cebe8282cef019b93 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 66d0a83eb9fd2b8289bb75be300e4fe038a49b81..bcb940f8b963a8b8fbc26b9433fd6291c728da74 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 80774323d3170c822c6e44c29fd10c6d04f934ac..d1811ac6a835b92193860fac92e5d3506af1b67c 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 81f0b4822a29eb9491d8c51c4a475909ec468999..d3972363bb4f94ce145b4dd73bc73417d8e1764e 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 3aa9e5278bca8bb5e758e6259e7373b2de6f8ce0..c1b2bc2625b1edaf45033a9a48962406f547db2b 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 bd201fa89bf69bd843ef8e243aa1ec4dcc5255c7..a3a3355d20fbb33edad352ec48db2d6a0654f864 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 b1a5c0c39c753e2eaee5d30bbabb76cef51d881e..45195b1e98da5753078870ff56d72f1ea6fb0eef 100644 (file)
@@ -35,7 +35,7 @@
 #include "BLI_string.h"
 
 extern "C" {
-#  include "BLI_voronoi.h"
+#  include "BLI_voronoi_2d.h"
 }
 
 /**
index 1145abd076aa66cdf6118351b9ee6be5a433da54..75a85ad7e33f9990015eced51f3c1ed319c22117 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 9d25fc9e1a32cc49837b18dd6619fc8e67448088..0ef6aa4bd4a1371a2d3cbd8b58705efc08b81b9f 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 100e2dc8295ba5ff5cb03e260884e029a9a47a3c..b23b9a06fbbafccf3c3630eaf951c1612f7a4125 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 07abab8af2ebb58118ef971e54ad26c023ceea60..dc3483163bf3ecd8c33088b18fc151d241cddaef 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 9f2f6de8a097c53a750c15859b5e9031f2e7f97b..7ffd82e262c2959a9ba1be1e77cd43ba4cee0f21 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 da66ec44235fef8ce7f6203f9fc975f75f82b39e..1cbc6aa39faf83c8ace7ab214709a5927f627564 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 264135d1d038c3c36ef3db1311e248dba2de7a40..9d960980f30ce019022439971ebf16a47571133b 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 d631a23bee06dbce344dc1c5a1a5883b47e7bcdb..67cd6e433c3d4e07c04008add1d4640aa37f5f81 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 110c4d1789d58a8f8958d2567d48184963ec2e93..3c3a71d00fdc93ae4ac26a6f8ecf454add44fc82 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 4ee85ace271bfadb5c87fc79b8e3af7ae697f1ca..ecbc1f5ae1ee56cc01dfc6187e38fd6701bd5a5e 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 392db4ef4b5a9e72143d78ecfd0d62d151f5ef50..0b7ce7d73107fd2efcec10688fb8a9dd33d789c1 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 dc7863bb354d07785df99bcedbe12ec1e61a3198..4b4add0e69826139f5adcd26f49d37ae17573540 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 cdbb57c436aeb380fd301440acbf8e628cb61c27..f999fab88ac978ca5764d0c0edfa1f39cd6bc59f 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 05cf552e5ccacc6114a338ace97c5cbcf1a8a226..82c239eb3203b8fefcc3365a13528254d9b6f91b 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 522640e4bdac72c7c601cd9a0b99f027ccbc20b5..928a0fc7d1e33b87d1f95617e3214ac506ab1e33 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 f8a93bd2ce3b292ba587bb9da06b1f77e2adecdb..c510c12ae53153fa8d45e26688d6ee59269a71f9 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 22e7bf3dd27cdf1eb248365da694daa1c5b7f949..c044cc5496530caefeaf66c953d5b94d9f7d5310 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 72f92d210d76dff346b25a1008b82b978b593cd6..fa0d271f7d327c304f7aedd616c18a6e5fa9f540 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 fbf184050932601528435de674b4138a54b80f6f..ce3331e9a9201fbaca3f4c8ad43ba9f90d1e5edb 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 7c62bf4cd949eab53adcbac0a1b43512d651af86..fb441662829ccd19ade20a03a4fbb3595996de98 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 1481e7a8059ec016741f54d953b6701baa306143..14184f4404bbeadb577eeb8a84c9ba5f65cd458e 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 b63962ffce2d46cf32bf15990441eb6dfb51871d..1a4381a1275b6b364772416275cb9a5a3a9e9ad5 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 4674df9983b75a3e9996386724e75c649329d1b6..744f6cf0ef25dcc63e091fc17f85abe72c268b79 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 01ab400b5b7fd0ca68ae6f39b1bce76d3971fe83..a8c7eff46268ac3e91599cc266149434630c2a46 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 715b689387f44f6163e2a58776d244d9d02c0758..cc1c95bd0fe1e88683bbac9757605aab034e9324 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")