Revision: 59792
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59792
Author: campbellbarton
Date: 2013-09-04 03:30:41 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/windowmanager/WM_api.h
Modified: trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c
2013-09-04 01:49:20 UTC (rev 59791)
+++ trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c
2013-09-04 03:30:41 UTC (rev 59792)
@@ -197,11 +197,13 @@
bmbvh_tri_from_face(tri_cos, ltri, bmcb_data->cos_cage);
- isect = ray->radius > 0.0f ?
- isect_ray_tri_epsilon_v3(ray->origin, ray->direction,
tri_cos[0], tri_cos[1], tri_cos[2], &dist, uv, ray->radius) :
- isect_ray_tri_v3(ray->origin, ray->direction, tri_cos[0],
tri_cos[1], tri_cos[2], &dist, uv);
- if (isect && dist < hit->dist)
- {
+ isect = (ray->radius > 0.0f ?
+ isect_ray_tri_epsilon_v3(ray->origin, ray->direction,
+ tri_cos[0], tri_cos[1], tri_cos[2],
&dist, uv, ray->radius) :
+ isect_ray_tri_v3(ray->origin, ray->direction,
+ tri_cos[0], tri_cos[1], tri_cos[2], &dist,
uv));
+
+ if (isect && dist < hit->dist) {
hit->dist = dist;
hit->index = index;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-09-04
01:49:20 UTC (rev 59791)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-09-04
03:30:41 UTC (rev 59792)
@@ -500,7 +500,8 @@
KnifeEdge *kfe = new_knife_edge(kcd), *kfe2 = NULL, *kfe3 = NULL;
if ((kcd->prev.vert && kcd->prev.vert == kcd->curr.vert) ||
- (kcd->prev.edge && kcd->prev.edge == kcd->curr.edge)) {
+ (kcd->prev.edge && kcd->prev.edge == kcd->curr.edge))
+ {
kcd->prev = kcd->curr;
return;
}
@@ -594,10 +595,14 @@
if (testi >= 0 && testi < kcd->totlinehit) {
if
(knife_find_common_face(&kcd->linehits[testi].kfe->faces,
&kcd->linehits[i].kfe->faces))
+ {
return i;
+ }
else if (kcd->linehits[testi].v &&
- kcd->linehits[testi].v == kcd->linehits[i].v)
+ kcd->linehits[testi].v == kcd->linehits[i].v)
+ {
return i;
+ }
}
else if (f) {
if (find_ref(&kcd->linehits[i].kfe->faces, f))
@@ -722,7 +727,8 @@
}
#endif
-static void copy_hit_from_posdata(BMEdgeHit *lh, KnifePosData *pos, float
lambda) {
+static void copy_hit_from_posdata(BMEdgeHit *lh, KnifePosData *pos, float
lambda)
+{
lh->kfe = pos->edge;
lh->v = pos->vert;
lh->f = pos->bmface;
@@ -1244,7 +1250,8 @@
n_isects = 0;
if (fabsf(dist_to_plane_v3(kfe->v1->cageco, tri_plane))
< KNIFE_FLT_EPS &&
- fabsf(dist_to_plane_v3(kfe->v2->cageco, tri_plane))
< KNIFE_FLT_EPS) {
+ fabsf(dist_to_plane_v3(kfe->v2->cageco, tri_plane))
< KNIFE_FLT_EPS)
+ {
/* both kfe ends are in cutting triangle */
copy_v3_v3(isects[0], kfe->v1->cageco);
copy_v3_v3(isects[1], kfe->v2->cageco);
Modified: trunk/blender/source/blender/windowmanager/WM_api.h
===================================================================
--- trunk/blender/source/blender/windowmanager/WM_api.h 2013-09-04 01:49:20 UTC
(rev 59791)
+++ trunk/blender/source/blender/windowmanager/WM_api.h 2013-09-04 03:30:41 UTC
(rev 59792)
@@ -144,9 +144,9 @@
void WM_event_remove_keymap_handler(ListBase *handlers, wmKeyMap
*keymap);
struct wmEventHandler *WM_event_add_ui_handler(
- const struct bContext *C, ListBase *handlers,
- int (*func)(struct bContext *C, const struct wmEvent *event,
void *userdata),
- void (*remove)(struct bContext *C, void *userdata), void
*userdata);
+ const struct bContext *C, ListBase *handlers,
+ int (*func)(struct bContext *C, const struct wmEvent *event, void
*userdata),
+ void (*remove)(struct bContext *C, void *userdata), void *userdata);
void WM_event_remove_ui_handler(ListBase *handlers,
int (*func)(struct bContext *C, const
struct wmEvent *event, void *userdata),
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
