diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 07:38:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 07:38:26 +0400 |
commit | 1767b658469b8f5553f53ede10b987dde9d502c6 (patch) | |
tree | 1b779c27fdbdbc54d1d3e09b45b21b689beba708 /source/blender/bmesh | |
parent | 05f147f12e879dcc640dc1014cd81dd0b0caca95 (diff) |
style cleanup: also rename bmesh_decimate.c --> bmesh_decimate_collapse.c
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_decimate.h | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_decimate_collapse.c (renamed from source/blender/bmesh/intern/bmesh_decimate.c) | 6 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 1e56314ab6e..3e0985471e1 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -64,7 +64,7 @@ set(SRC intern/bmesh_construct.h intern/bmesh_core.c intern/bmesh_core.h - intern/bmesh_decimate.c + intern/bmesh_decimate_collapse.c intern/bmesh_decimate.h intern/bmesh_inline.h intern/bmesh_interp.c diff --git a/source/blender/bmesh/intern/bmesh_decimate.h b/source/blender/bmesh/intern/bmesh_decimate.h index 1724bbd16bb..7fafb752e1e 100644 --- a/source/blender/bmesh/intern/bmesh_decimate.h +++ b/source/blender/bmesh/intern/bmesh_decimate.h @@ -27,6 +27,6 @@ * \ingroup bmesh */ -void BM_mesh_decimate(BMesh *bm, const float factor, float *vweights); +void BM_mesh_decimate_collapse(BMesh *bm, const float factor, float *vweights); #endif /* __BMESH_DECIMATE_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_decimate.c b/source/blender/bmesh/intern/bmesh_decimate_collapse.c index a4be3933a8d..75fe12a418a 100644 --- a/source/blender/bmesh/intern/bmesh_decimate.c +++ b/source/blender/bmesh/intern/bmesh_decimate_collapse.c @@ -40,7 +40,7 @@ #include "bmesh.h" #include "bmesh_structure.h" -#include "bmesh_decimate.h" +#include "bmesh_decimate.h" /* own include */ /* defines for testing */ #define USE_CUSTOMDATA @@ -112,7 +112,7 @@ static void bm_decim_build_quadrics(BMesh *bm, Quadric *vquadrics) static void bm_decim_calc_target_co(BMEdge *e, float optimize_co[3], const Quadric *vquadrics) { - /* compute an edge contration target for edge ei + /* compute an edge contration target for edge 'e' * this is computed by summing it's vertices quadrics and * optimizing the result. */ Quadric q; @@ -855,7 +855,7 @@ static void bm_decim_edge_collapse(BMesh *bm, BMEdge *e, * \param vertex_weights Optional array of vertex aligned weights [0 - 1], * a vertex group is the usual source for this. */ -void BM_mesh_decimate(BMesh *bm, const float factor, float *vweights) +void BM_mesh_decimate_collapse(BMesh *bm, const float factor, float *vweights) { Heap *eheap; /* edge heap */ HeapNode **eheap_table; /* edge index aligned table pointing to the eheap */ diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 91ca7124fc2..a5694ecd920 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -437,7 +437,7 @@ BMFace *BM_face_split_n(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, float cos[ /* bmesh_semv returns in newe the edge going from newv to tv */ copy_v3_v3(newv->co, cos[i]); - /* interpolate the loop data for the loops with v==newv, using orig face */ + /* interpolate the loop data for the loops with (v == newv), using orig face */ for (j = 0; j < 2; j++) { BMEdge *e_iter = (j == 0) ? e : newe; BMLoop *l_iter = e_iter->l; |