Commit: aa69fb64ac2d90f578205b6ea689e1a36f6dbf7c
Author: Campbell Barton
Date: Thu Jan 21 09:05:52 2016 +1100
Branches: master
https://developer.blender.org/rBaa69fb64ac2d90f578205b6ea689e1a36f6dbf7c
Cleanup: line length, indentation
===================================================================
M source/blender/blenlib/intern/math_statistics.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/mesh/meshtools.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_view3d/drawvolume.c
M source/blender/imbuf/intern/stereoimbuf.c
M source/blender/makesrna/intern/rna_cloth.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/physics/intern/implicit_blender.c
M source/blender/physics/intern/implicit_eigen.cpp
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/blenlib/intern/math_statistics.c
b/source/blender/blenlib/intern/math_statistics.c
index fbd6563..fd7418a 100644
--- a/source/blender/blenlib/intern/math_statistics.c
+++ b/source/blender/blenlib/intern/math_statistics.c
@@ -114,7 +114,7 @@ void BLI_covariance_m_vn_ex(
CovarianceData data = {
.cos_vn = cos_vn, .center = center, .r_covmat = r_covmat,
- .covfac = covfac, .n = n, .nbr_cos_vn = nbr_cos_vn,
+ .covfac = covfac, .n = n, .nbr_cos_vn = nbr_cos_vn,
};
BLI_task_parallel_range(
diff --git a/source/blender/blenloader/intern/versioning_260.c
b/source/blender/blenloader/intern/versioning_260.c
index 027c3eb..6dd2d99 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -459,19 +459,19 @@ static void
do_versions_affine_tracker_track(MovieTrackingTrack *track)
if (is_zero_v2(marker->pattern_corners[0]) &&
is_zero_v2(marker->pattern_corners[1]) &&
is_zero_v2(marker->pattern_corners[2]) &&
is_zero_v2(marker->pattern_corners[3]))
- {
- marker->pattern_corners[0][0] =
track->pat_min[0];
- marker->pattern_corners[0][1] =
track->pat_min[1];
+ {
+ marker->pattern_corners[0][0] = track->pat_min[0];
+ marker->pattern_corners[0][1] = track->pat_min[1];
- marker->pattern_corners[1][0] =
track->pat_max[0];
- marker->pattern_corners[1][1] =
track->pat_min[1];
+ marker->pattern_corners[1][0] = track->pat_max[0];
+ marker->pattern_corners[1][1] = track->pat_min[1];
- marker->pattern_corners[2][0] =
track->pat_max[0];
- marker->pattern_corners[2][1] =
track->pat_max[1];
+ marker->pattern_corners[2][0] = track->pat_max[0];
+ marker->pattern_corners[2][1] = track->pat_max[1];
- marker->pattern_corners[3][0] =
track->pat_min[0];
- marker->pattern_corners[3][1] =
track->pat_max[1];
- }
+ marker->pattern_corners[3][0] = track->pat_min[0];
+ marker->pattern_corners[3][1] = track->pat_max[1];
+ }
if (is_zero_v2(marker->search_min) &&
is_zero_v2(marker->search_max)) {
copy_v2_v2(marker->search_min, track->search_min);
diff --git a/source/blender/editors/mesh/editmesh_knife.c
b/source/blender/editors/mesh/editmesh_knife.c
index 0dd7b85..3cef547 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -1651,8 +1651,8 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd)
hit.v = v;
/* If this isn't from an existing BMVert, it may have
been added to a BMEdge originally.
- * knowing if the hit comes from an edge is
important for edge-in-face checks later on
- * see: #knife_add_single_cut ->
#knife_verts_edge_in_face, T42611 */
+ * knowing if the hit comes from an edge is important
for edge-in-face checks later on
+ * see: #knife_add_single_cut ->
#knife_verts_edge_in_face, T42611 */
if (kfe_hit) {
hit.kfe = kfe_hit;
}
diff --git a/source/blender/editors/mesh/meshtools.c
b/source/blender/editors/mesh/meshtools.c
index 431af56..bad835b 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -905,7 +905,9 @@ static float *editmesh_get_mirror_uv(BMEditMesh *em, int
axis, float *uv, float
if (isnan(uv[0]) || !finite(uv[0]) ||
isnan(uv[1]) || !finite(uv[1])
)
+ {
return NULL;
+ }
if (axis) {
vec[0] = uv[0];
diff --git a/source/blender/editors/sculpt_paint/paint_image.c
b/source/blender/editors/sculpt_paint/paint_image.c
index a43fb90..49e5e26 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -651,7 +651,7 @@ bool paint_use_opacity_masking(Brush *brush)
(brush->imagepaint_tool == PAINT_TOOL_SOFTEN) ||
(brush->imagepaint_tool == PAINT_TOOL_FILL) ||
(brush->flag & BRUSH_USE_GRADIENT) ||
- (brush->mtex.tex && !ELEM(brush->mtex.brush_map_mode,
MTEX_MAP_MODE_TILED, MTEX_MAP_MODE_STENCIL, MTEX_MAP_MODE_3D)) ?
+ (brush->mtex.tex && !ELEM(brush->mtex.brush_map_mode,
MTEX_MAP_MODE_TILED, MTEX_MAP_MODE_STENCIL, MTEX_MAP_MODE_3D)) ?
false : true;
}
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c
b/source/blender/editors/sculpt_paint/paint_vertex.c
index 878c827..7dd96c3 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1078,7 +1078,8 @@ static bool weight_paint_sample_enum_itemf__helper(const
MDeformVert *dvert, con
}
return found;
}
-static EnumPropertyItem *weight_paint_sample_enum_itemf(bContext *C,
PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
+static EnumPropertyItem *weight_paint_sample_enum_itemf(
+ bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool
*r_free)
{
if (C) {
wmWindow *win = CTX_wm_window(C);
@@ -2080,9 +2081,11 @@ static void wpaint_stroke_update_step(bContext *C,
struct PaintStroke *stroke, P
wpd->do_multipaint ? wpaint_blur_weight_multi :
wpaint_blur_weight_single;
const float pressure = RNA_float_get(itemptr, "pressure");
- const float brush_size_pressure = BKE_brush_size_get(scene, brush) *
(BKE_brush_use_size_pressure(scene, brush) ? pressure : 1.0f);
+ const float brush_size_pressure =
+ BKE_brush_size_get(scene, brush) *
(BKE_brush_use_size_pressure(scene, brush) ? pressure : 1.0f);
const float brush_alpha_value = BKE_brush_alpha_get(scene, brush);
- const float brush_alpha_pressure = brush_alpha_value *
(BKE_brush_use_alpha_pressure(scene, brush) ? pressure : 1.0f);
+ const float brush_alpha_pressure =
+ brush_alpha_value * (BKE_brush_use_alpha_pressure(scene, brush)
? pressure : 1.0f);
/* intentionally don't initialize as NULL, make sure we initialize all
members below */
WeightPaintInfo wpi;
@@ -2176,7 +2179,8 @@ static void wpaint_stroke_update_step(bContext *C, struct
PaintStroke *stroke, P
#define WP_BLUR_ACCUM(v_idx_var) \
{ \
const unsigned int vidx = v_idx_var; \
- const float fac = calc_vp_strength_col_dl(wp, vc,
wpd->vertexcosnos[vidx].co, mval, brush_size_pressure, NULL); \
+ const float fac = calc_vp_strength_col_dl( \
+ wp, vc, wpd->vertexcosnos[vidx].co, mval,
brush_size_pressure, NULL); \
if (fac > 0.0f) { \
float weight = blur_weight_func(&me->dvert[vidx],
&wpi); \
paintweight += weight * fac; \
@@ -2704,8 +2708,10 @@ static void vpaint_stroke_update_step(bContext *C,
struct PaintStroke *stroke, P
float mval[2];
const float pressure = RNA_float_get(itemptr, "pressure");
- const float brush_size_pressure = BKE_brush_size_get(scene, brush) *
(BKE_brush_use_size_pressure(scene, brush) ? pressure : 1.0f);
- const float brush_alpha_pressure = BKE_brush_alpha_get(scene, brush) *
(BKE_brush_use_alpha_pressure(scene, brush) ? pressure : 1.0f);
+ const float brush_size_pressure =
+ BKE_brush_size_get(scene, brush) *
(BKE_brush_use_size_pressure(scene, brush) ? pressure : 1.0f);
+ const float brush_alpha_pressure =
+ BKE_brush_alpha_get(scene, brush) *
(BKE_brush_use_alpha_pressure(scene, brush) ? pressure : 1.0f);
RNA_float_get_array(itemptr, "mouse", mval);
@@ -3173,7 +3179,8 @@ static int paint_weight_gradient_invoke(bContext *C,
wmOperator *op, const wmEve
if (ret & OPERATOR_RUNNING_MODAL) {
struct ARegion *ar = CTX_wm_region(C);
if (ar->regiontype == RGN_TYPE_WINDOW) {
- if (event->type == LEFTMOUSE && event->val == KM_PRESS)
{ /* TODO, hardcoded, extend WM_gesture_straightline_ */
+ /* TODO, hardcoded, extend WM_gesture_straightline_ */
+ if (event->type == LEFTMOUSE && event->val == KM_PRESS)
{
wmGesture *gesture = op->customdata;
gesture->mode = 1;
}
diff --git a/source/blender/editors/sculpt_paint/sculpt.c
b/source/blender/editors/sculpt_paint/sculpt.c
index da2a987..f97d877 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -402,7 +402,7 @@ typedef struct SculptThreadedTaskData {
Sculpt *sd;
Object *ob;
Brush *brush;
- PBVHNode **nodes;
+ PBVHNode **nodes;
int totnode;
/* Data specific to some callbacks. */
@@ -946,7 +946,7 @@ static void calc_area_center(
SculptThreadedTaskData data = {
.sd = sd, .ob = ob, .nodes = nodes, .totnode = totnode,
- .has_bm_orco = has_bm_orco, .area_cos = area_cos, .area_nos = NULL,
.count = count,
+ .has_bm_orco = has_bm_orco, .area_cos = area_cos, .area_nos =
NULL, .count = count,
};
BLI_mutex_init(&data.mutex);
@@ -986,7 +986,7 @@ static void calc_area_normal(
SculptThreadedTaskData data = {
.sd = sd, .ob = ob, .nodes = nodes, .totnode = totnode,
- .has_bm_orco = has_bm_orco, .area_cos = NULL, .area_nos = area_nos,
.count = count,
+ .has_bm_orco = has_bm_orco, .area_cos = NULL, .area_nos =
area_nos, .count = count,
};
BLI_mutex_init(&data.mutex);
@@ -1024,7 +1024,7 @@ static void calc_area_normal_and_center(
SculptThreadedTaskData data = {
.sd = sd, .ob = ob, .nodes = nodes, .totnode = totnode,
- .has_bm_orco = has_bm_orco, .area_cos = area_cos, .area_nos =
area_nos, .count = count,
+ .has_bm_orco = has_bm_orco, .area_cos = area_cos, .area_nos =
area_nos, .count = count,
};
BLI_mutex_init(&data.mutex);
diff --git a/source/blender/editors/space_file/file_ops.c
b/source/blender/editors/space_file/file_ops.c
index 121bf75..1b5428c 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -1041,7 +1041,7 @@ static int bookmark_move_exec(bContext *C, wmOperator *op)
void FILE_OT_bookmark_move(wmOperatorType *ot)
{
static EnumPropertyItem slot_move[] = {
- {FILE_BOOKMARK_MOVE_TOP, "TOP", 0, "Top", "Top of the list"},
+ {FILE_BOOKMARK_MOVE_TOP, "TOP", 0, "Top", "Top of the list"},
{FILE_BOOKMARK_MOVE_UP, "UP", 0, "Up", ""},
{FILE_BOOKMARK_MOVE_DOWN, "DOWN", 0, "Down", ""},
{FILE_BOOKMARK_MOVE_BOTTOM, "BOTTOM", 0, "Bottom", "Bottom of
the list"},
diff --git a/source/blender/editors/space_image/image_ops.c
b/source/blender/editors/space_image/image_ops.c
index c35f5ae..4d05a87 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
