[Bf-blender-cvs] [4162b83590a] master: Cleanup: use braces for single line if statements
Campbell Barton
noreply at git.blender.org
Thu Jan 24 13:23:50 CET 2019
Commit: 4162b83590a7e14626e3741ec185fb40815fb1a3
Author: Campbell Barton
Date: Thu Jan 24 22:59:55 2019 +1100
Branches: master
https://developer.blender.org/rB4162b83590a7e14626e3741ec185fb40815fb1a3
Cleanup: use braces for single line if statements
===================================================================
M source/blender/editors/space_view3d/view3d_select.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 3125d4bfde3..8f7882d1d59 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1612,7 +1612,9 @@ static bool ed_object_select_pick(
/* always start list from basact in wire mode */
startbase = FIRSTBASE(view_layer);
- if (oldbasact && oldbasact->next) startbase = oldbasact->next;
+ if (oldbasact && oldbasact->next) {
+ startbase = oldbasact->next;
+ }
/* This block uses the control key to make the object selected
* by its center point rather than its contents */
@@ -1634,7 +1636,9 @@ static bool ed_object_select_pick(
V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_WIN | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK)
{
float dist_temp = len_manhattan_v2v2(mval_fl, screen_co);
- if (base == oldbasact) dist_temp += 10.0f;
+ if (base == oldbasact) {
+ dist_temp += 10.0f;
+ }
if (dist_temp < dist) {
dist = dist_temp;
basact = base;
@@ -1643,8 +1647,12 @@ static bool ed_object_select_pick(
}
base = base->next;
- if (base == NULL) base = FIRSTBASE(view_layer);
- if (base == startbase) break;
+ if (base == NULL) {
+ base = FIRSTBASE(view_layer);
+ }
+ if (base == startbase) {
+ break;
+ }
}
}
if (scene->toolsettings->object_flag & SCE_OBJECT_MODE_LOCK) {
@@ -1721,13 +1729,15 @@ static bool ed_object_select_pick(
}
else {
int oldsel = TRACK_SELECTED(track) ? 1 : 0;
- if (!extend)
+ if (!extend) {
deselect_all_tracks(tracking);
+ }
BKE_tracking_track_select(tracksbase, track, TRACK_AREA_ALL, extend);
- if (oldsel != (TRACK_SELECTED(track) ? 1 : 0))
+ if (oldsel != (TRACK_SELECTED(track) ? 1 : 0)) {
changed = true;
+ }
}
basact->flag |= BASE_SELECTED;
@@ -1774,8 +1784,9 @@ static bool ed_object_select_pick(
}
/* prevent bone selecting to pass on to object selecting */
- if (basact == oldbasact)
+ if (basact == oldbasact) {
basact = NULL;
+ }
}
if (scene->toolsettings->object_flag & SCE_OBJECT_MODE_LOCK) {
More information about the Bf-blender-cvs
mailing list