diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-07 23:19:56 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-07 23:19:56 +0400 |
commit | 541d239cdceced6067850053e707de3bb6a3c938 (patch) | |
tree | 1b3d2b6c3b932bcdc72d60d13096f5141026f565 /source/blender/bmesh/intern | |
parent | 0c98a407a2e337ca3a3ba6be602fbbafa2e6a0a0 (diff) |
fix for error in r44711, needed to update sequencer callback.
also quiet some warnings.
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 944b3b434c7..ab8014ce25d 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -358,7 +358,7 @@ static void bm_rationalize_normals(BMesh *bm, int undo) BMO_op_finish(bm, &bmop); } -static void bm_mdisps_space_set(BMesh *bm, int from, int to) +static void UNUSED_FUNCTION(bm_mdisps_space_set)(BMesh *bm, int from, int to) { /* switch multires data out of tangent space */ if (CustomData_has_layer(&bm->ldata, CD_MDISPS)) { diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index f47d9c0bc36..dac95dfcfc0 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -830,10 +830,11 @@ void BM_edge_rotate_calc(BMesh *bm, BMEdge *e, int ccw, SWAP(BMFace *, fa, fb); } - - *r_l1 = BM_face_other_vert_loop(fb, v2, v1); *r_l2 = BM_face_other_vert_loop(fa, v1, v2); + + /* when assert isnt used */ + (void)bm; } /** @@ -970,6 +971,9 @@ int BM_edge_rotate_check_degenerate(BMesh *bm, BMEdge *e, } return TRUE; + + /* when assert isnt used */ + (void)bm; } int BM_edge_rotate_check_beauty(BMesh *UNUSED(bm), BMEdge *e, |