Cleanup: style

This commit is contained in:
2017-10-06 16:56:41 +11:00
parent c82efd3276
commit c454d816a9
14 changed files with 45 additions and 45 deletions

View File

@@ -1454,8 +1454,7 @@ static bool do_add_image_extension(char *string, const char imtype, const ImageF
if (extension) {
/* prefer this in many cases to avoid .png.tga, but in certain cases it breaks */
/* remove any other known image extension */
if (BLI_testextensie_array(string, imb_ext_image))
{
if (BLI_testextensie_array(string, imb_ext_image)) {
return BLI_replace_extension(string, FILE_MAX, extension);
}
else {

View File

@@ -607,7 +607,8 @@ void BKE_pbvh_build_grids(PBVH *bvh, CCGElem **grids,
MEM_freeN(prim_bbc);
}
void BKE_pbvh_set_ccgdm(PBVH *bvh, CCGDerivedMesh *ccgdm) {
void BKE_pbvh_set_ccgdm(PBVH *bvh, CCGDerivedMesh *ccgdm)
{
bvh->ccgdm = ccgdm;
}
@@ -1334,7 +1335,8 @@ void BKE_pbvh_get_grid_key(const PBVH *bvh, CCGKey *key)
*key = bvh->gridkey;
}
CCGDerivedMesh *BKE_pbvh_get_ccgdm(const PBVH *bvh) {
CCGDerivedMesh *BKE_pbvh_get_ccgdm(const PBVH *bvh)
{
return bvh->ccgdm;
}

View File

@@ -9249,7 +9249,8 @@ static int ui_handle_menu_event(
UI_BTYPE_BUT_MENU,
UI_BTYPE_MENU, UI_BTYPE_BLOCK,
UI_BTYPE_PULLDOWN) &&
count == act) {
count == act)
{
doit = true;
}

View File

@@ -609,8 +609,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
return 1;
}
}
else if (CTX_data_equals(member, "selected_editable_fcurves"))
{
else if (CTX_data_equals(member, "selected_editable_fcurves")) {
bAnimContext ac;
if (ANIM_animdata_get_context(C, &ac) && ELEM(ac.spacetype, SPACE_ACTION, SPACE_IPO)) {

View File

@@ -4552,7 +4552,6 @@ bool sculpt_stroke_get_location(bContext *C, float out[3], const float mouse[2])
}
}
//used in vwpaint
if (cache && hit) {
copy_v3_v3(cache->true_location, out);
}

View File

@@ -1994,8 +1994,7 @@ int ED_path_extension_type(const char *path)
else if (BLI_testextensie(path, ".abc")) {
return FILE_TYPE_ALEMBIC;
}
else if (BLI_testextensie_array(path, imb_ext_image))
{
else if (BLI_testextensie_array(path, imb_ext_image)) {
return FILE_TYPE_IMAGE;
}
else if (BLI_testextensie(path, ".ogg")) {

View File

@@ -1330,7 +1330,8 @@ static int image_open_exec(bContext *C, wmOperator *op)
iuser->framenr = 1;
if (ima->source == IMA_SRC_MOVIE) {
iuser->offset = 0;
} else {
}
else {
iuser->offset = frame_ofs - 1;
}
iuser->fie_ima = 2;