diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-03-07 06:28:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-07 06:28:39 +0400 |
commit | 03af4cbf9173dd0440517dd0b9f8d464a4ec0350 (patch) | |
tree | ce682c3014a529aabf622c4b1b091a6e19ad292b /source/blender/editors | |
parent | 276ef3b3b5192aad5c3e5e02c69246818f89033b (diff) |
Code cleanup: style
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 12 | ||||
-rw-r--r-- | source/blender/editors/space_text/space_text.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 9b92ca6ccf8..df1b14a29ea 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3922,8 +3922,8 @@ static void sculpt_update_cache_invariants(bContext *C, Sculpt *sd, SculptSessio mul_m3_v3(mat, viewDir); normalize_v3_v3(cache->true_view_normal, viewDir); - cache->supports_gravity = !ELEM3(brush->sculpt_tool, SCULPT_TOOL_MASK, SCULPT_TOOL_SMOOTH, SCULPT_TOOL_SIMPLIFY) - && sd->gravity_factor > 0.0f; + cache->supports_gravity = (!ELEM3(brush->sculpt_tool, SCULPT_TOOL_MASK, SCULPT_TOOL_SMOOTH, SCULPT_TOOL_SIMPLIFY) && + (sd->gravity_factor > 0.0f)); /* get gravity vector in world space */ if (cache->supports_gravity) { if (sd->gravity_object) { @@ -4486,13 +4486,13 @@ static void sculpt_stroke_update_step(bContext *C, struct PaintStroke *UNUSED(st sculpt_restore_mesh(sd, ob); if (sd->flags & SCULPT_DYNTOPO_DETAIL_CONSTANT) { - BKE_pbvh_bmesh_detail_size_set(ss->pbvh, (float)sd->detail_size/100.0f); + BKE_pbvh_bmesh_detail_size_set(ss->pbvh, (float)sd->detail_size / 100.0f); } else { BKE_pbvh_bmesh_detail_size_set(ss->pbvh, - (ss->cache->radius / - (float)ups->pixel_radius) * - (float)sd->detail_size); + (ss->cache->radius / + (float)ups->pixel_radius) * + (float)sd->detail_size); } if (sculpt_stroke_dynamic_topology(ss, brush)) { diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c index 8b0800083d5..2986408d7ee 100644 --- a/source/blender/editors/space_text/space_text.c +++ b/source/blender/editors/space_text/space_text.c @@ -454,7 +454,7 @@ static void text_cursor(wmWindow *win, ScrArea *sa, ARegion *ar) SpaceText *st = sa->spacedata.first; int wmcursor = BC_TEXTEDITCURSOR; - if(st->text && BLI_rcti_isect_pt(&st->txtbar, win->eventstate->x - ar->winrct.xmin, st->txtbar.ymin)) { + if (st->text && BLI_rcti_isect_pt(&st->txtbar, win->eventstate->x - ar->winrct.xmin, st->txtbar.ymin)) { wmcursor = CURSOR_STD; } diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 6bf931583b6..3af947b472e 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -685,7 +685,7 @@ static void stitch_uv_edge_generate_linked_edges(GHash *edge_hash, StitchState * edge2 = BLI_ghash_lookup(edge_hash, &edgetmp); /* more iteration to make sure non-manifold case is handled nicely */ - for (eiter = edge; eiter; eiter = eiter->next){ + for (eiter = edge; eiter; eiter = eiter->next) { if (edge2 == eiter) { valid = false; break; |