tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

style cleanup

This commit is contained in:
Campbell Barton 2013-08-27 21:30:33 +00:00
parent 51d399aaab
commit 11703b4955
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/treehash.c
View File

@ -107,7 +107,8 @@ void *BKE_treehash_create_from_treestore(BLI_mempool *treestore)
return treehash;
}
static void free_treehash_group(void *key) {
static void free_treehash_group(void *key)
{
tse_group_free(key);
}

2
source/blender/bmesh/intern/bmesh_opdefines.c
View File

@ -1129,7 +1129,7 @@ static BMOpDefine bmo_bisect_plane_def = {
{"dist", BMO_OP_SLOT_FLT}, /* minimum distance when testing if a vert is exactly on the plane */
{"plane_co", BMO_OP_SLOT_VEC}, /* point on the plane */
{"plane_no", BMO_OP_SLOT_VEC}, /* direction of the plane */
{"use_snap_center",BMO_OP_SLOT_BOOL}, /* snap axis aligned verts to the center */
{"use_snap_center", BMO_OP_SLOT_BOOL}, /* snap axis aligned verts to the center */
{"clear_outer", BMO_OP_SLOT_BOOL}, /* when enabled. remove all geometry on the positive side of the plane */
{"clear_inner", BMO_OP_SLOT_BOOL}, /* when enabled. remove all geometry on the negative side of the plane */
{{'\0'}},

10
source/blender/bmesh/tools/bmesh_bisect_plane.c
View File

@ -182,7 +182,7 @@ static void bm_face_bisect_verts(BMesh *bm, BMFace *f, const float plane[4], con
cross_v3_v3v3(sort_dir, f->no, plane);
if (UNLIKELY(normalize_v3(sort_dir) == 0.0f)) {
/* find any 2 verts and get their direction */
for(i = 0; i < STACK_SIZE(vert_split_arr); i++) {
for (i = 0; i < STACK_SIZE(vert_split_arr); i++) {
if (!equals_v3v3(vert_split_arr[0]->co, vert_split_arr[i]->co)) {
sub_v3_v3v3(sort_dir, vert_split_arr[0]->co, vert_split_arr[i]->co);
normalize_v3(sort_dir);
@ -214,7 +214,7 @@ static void bm_face_bisect_verts(BMesh *bm, BMFace *f, const float plane[4], con
/* ---- */
/* Sort the verts across the face from one side to another */
for(i = 0; i < STACK_SIZE(vert_split_arr); i++) {
for (i = 0; i < STACK_SIZE(vert_split_arr); i++) {
BMVert *v = vert_split_arr[i];
BM_VERT_SORTVAL(v) = dot_v3v3(sort_dir, v->co);
}
@ -233,7 +233,7 @@ static void bm_face_bisect_verts(BMesh *bm, BMFace *f, const float plane[4], con
STACK_INIT(face_split_arr);
STACK_PUSH(face_split_arr, f);
for(i = 0; i < STACK_SIZE(vert_split_arr) - 1; i++) {
for (i = 0; i < STACK_SIZE(vert_split_arr) - 1; i++) {
BMVert *v_a = vert_split_arr[i];
BMVert *v_b = vert_split_arr[i + 1];
float co_mid[2];
@ -249,7 +249,7 @@ static void bm_face_bisect_verts(BMesh *bm, BMFace *f, const float plane[4], con
bool found = false;
unsigned int j;
for(j = 0; j < STACK_SIZE(face_split_arr); j++) {
for (j = 0; j < STACK_SIZE(face_split_arr); j++) {
/* would be nice to avoid loop lookup here,
* but we need to know which face the verts are in */
if ((l_a = BM_face_vert_share_loop(face_split_arr[j], v_a)) &&
@ -352,7 +352,7 @@ void BM_mesh_bisect_plane(BMesh *bm, float plane[4],
/* store a stack of faces to be evaluated for splitting */
BLI_LINKSTACK_INIT(face_stack);
for(i = 0; i < einput_len; i++) {
for (i = 0; i < einput_len; i++) {
/* we could check edge_is_cut_test(e) but there is no point */
BMEdge *e = edges_arr[i];
const int side[2] = {BM_VERT_DIR(e->v1), BM_VERT_DIR(e->v2)};