Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-02-13 01:51:33 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-02-13 01:52:12 +0400
commitaea00c7a81de90fd3f0b976ee1a7d5040c9f18e7 (patch)
treeade0cea55687b6b69673adb7ea4ad24e61b4adf8 /source/blender/editors
parent8547d17739d1fc6eb2bd648af8dadae809865614 (diff)
Code cleanup: style
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_regions.c2
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_uv.c2
-rw-r--r--source/blender/editors/transform/transform_snap.c14
3 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 78a4a1cc489..2d0bb488342 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -2123,7 +2123,7 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
direction = pup->block->direction;
}
else if ((pup->but->type == PULLDOWN) ||
- (uiButGetMenuType(pup->but) != NULL))
+ (uiButGetMenuType(pup->but) != NULL))
{
direction = UI_DOWN;
}
diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c
index c42e3e4b298..4dc2c87ca0a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_uv.c
+++ b/source/blender/editors/sculpt_paint/sculpt_uv.c
@@ -169,7 +169,9 @@ static int uv_sculpt_brush_poll(bContext *C)
if (!uv_sculpt_brush(C) || !obedit || obedit->type != OB_MESH ||
!sima || ED_space_image_show_render(sima) || (sima->mode == SI_MODE_PAINT))
+ {
return 0;
+ }
em = BKE_editmesh_from_object(obedit);
ret = EDBM_mtexpoly_check(em);
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index e7b5add64db..93b3b6d4a66 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -1572,8 +1572,8 @@ static bool snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMes
}
if (treeData.tree &&
- BLI_bvhtree_ray_cast(treeData.tree, ray_start_local, ray_normal_local, 0.0f,
- &hit, treeData.raycast_callback, &treeData) != -1)
+ BLI_bvhtree_ray_cast(treeData.tree, ray_start_local, ray_normal_local, 0.0f,
+ &hit, treeData.raycast_callback, &treeData) != -1)
{
hit.dist += len_diff;
hit.dist /= local_scale;
@@ -1624,8 +1624,8 @@ static bool snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMes
else {
eve = BM_vert_at_index(em->bm, index);
- if ((BM_elem_flag_test(eve, BM_ELEM_HIDDEN) ||
- BM_elem_flag_test(eve, BM_ELEM_SELECT)))
+ if (BM_elem_flag_test(eve, BM_ELEM_HIDDEN) ||
+ BM_elem_flag_test(eve, BM_ELEM_SELECT))
{
test = false;
}
@@ -1672,9 +1672,9 @@ static bool snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMes
else {
BMEdge *eed = BM_edge_at_index(em->bm, index);
- if ((BM_elem_flag_test(eed, BM_ELEM_HIDDEN) ||
- BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) ||
- BM_elem_flag_test(eed->v2, BM_ELEM_SELECT)))
+ if (BM_elem_flag_test(eed, BM_ELEM_HIDDEN) ||
+ BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) ||
+ BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))
{
test = false;
}