diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-28 19:23:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-28 19:23:16 +0400 |
commit | 0c6a0b293f5e9a1f37a6aea267e4a723731d4225 (patch) | |
tree | 1b69e5c4633e87c93d5e7a4282d490fab0ed740d /source/blender/bmesh | |
parent | d800cffaf10cb73446d4f3739bca968224f3a1dc (diff) |
style cleanup
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_decimate_collapse.c | 1 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_smooth_laplacian.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_decimate_collapse.c b/source/blender/bmesh/intern/bmesh_decimate_collapse.c index 5935a844988..fbdbe2ffe94 100644 --- a/source/blender/bmesh/intern/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/intern/bmesh_decimate_collapse.c @@ -395,6 +395,7 @@ static void bm_edge_collapse_loop_customdata(BMesh *bm, BMLoop *l, BMVert *v_cle BLI_assert(l_clear->v == v_clear); BLI_assert(l_other->v == v_other); + (void)v_other; /* quiet warnings for release */ /* now we have both corners of the face 'l->f' */ for (side = 0; side < 2; side++) { diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.c b/source/blender/bmesh/operators/bmo_smooth_laplacian.c index 0c367514a93..9a2a9c022e6 100644 --- a/source/blender/bmesh/operators/bmo_smooth_laplacian.c +++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.c @@ -75,13 +75,13 @@ static int vert_is_boundary(BMVert *v); static LaplacianSystem * init_laplacian_system( int a_numEdges, int a_numFaces, int a_numVerts); static void init_laplacian_matrix(LaplacianSystem * sys); static void delete_laplacian_system(LaplacianSystem * sys); -static void delete_void_pointer(void * data); +static void delete_void_pointer(void *data); static void fill_laplacian_matrix(LaplacianSystem * sys); static void memset_laplacian_system(LaplacianSystem *sys, int val); static void validate_solution(LaplacianSystem * sys, int usex, int usey, int usez, int volumepreservation); static void volume_preservation(BMesh *bm, BMOperator *op, float vini, float vend, int usex, int usey, int usez); -static void delete_void_pointer(void * data) +static void delete_void_pointer(void *data) { if (data) { MEM_freeN(data); |