[Bf-blender-cvs] [0fbf5b7] blender-v2.72-release: Cleanup: style
Campbell Barton
noreply at git.blender.org
Wed Oct 15 13:07:59 CEST 2014
Commit: 0fbf5b73ce14474e5f42a8da43665a1b6f220847
Author: Campbell Barton
Date: Mon Oct 6 21:49:38 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rB0fbf5b73ce14474e5f42a8da43665a1b6f220847
Cleanup: style
===================================================================
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_conversions.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 01b7248..8c97f19 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -5096,7 +5096,7 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op)
DAG_id_tag_update(&ma->id, 0);
ED_area_tag_redraw(CTX_wm_area(C));
- return true;
+ return true;
}
}
@@ -5105,9 +5105,12 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op)
static int texture_paint_add_texture_paint_slot_exec(bContext *C, wmOperator *op)
{
- if(proj_paint_add_slot(C, op))
+ if (proj_paint_add_slot(C, op)) {
return OPERATOR_FINISHED;
- else return OPERATOR_CANCELLED;
+ }
+ else {
+ return OPERATOR_CANCELLED;
+ }
}
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 008022a..d5a26b1 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -270,7 +270,8 @@ void convertViewVec(TransInfo *t, float r_vec[3], int dx, int dy)
r_vec[0] = dx;
r_vec[1] = dy;
}
- else { const float mval_f[2] = {(float)dx, (float)dy};
+ else {
+ const float mval_f[2] = {(float)dx, (float)dy};
ED_view3d_win_to_delta(t->ar, mval_f, r_vec, t->zfac);
}
}
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index aa21561..9e6f5d2 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1711,7 +1711,9 @@ static void createTransLatticeVerts(TransInfo *t)
if (bp->f1 & SELECT) {
td->flag = TD_SELECTED;
}
- else td->flag = 0;
+ else {
+ td->flag = 0;
+ }
copy_m3_m3(td->smtx, smtx);
copy_m3_m3(td->mtx, mtx);
More information about the Bf-blender-cvs
mailing list