Commit: 22bc9fb4a9eca2dce4f51652d61f14f65eef0227
Author: Campbell Barton
Date: Thu Apr 4 08:13:13 2019 +1100
Branches: master
https://developer.blender.org/rB22bc9fb4a9eca2dce4f51652d61f14f65eef0227
Cleanup: style
===================================================================
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M source/blender/draw/engines/gpencil/gpencil_shader_fx.c
M source/blender/draw/intern/draw_armature.c
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache_impl_displist.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/screen/screen_ops.c
===================================================================
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 2847a8c14c2..08c7b87d5e3 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -390,7 +390,7 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
ComponentNode *comp_node = op_node->owner;
IDNode *id_node = comp_node->owner;
flush_handle_id_node(id_node);
- flush_handle_component_node(id_node,comp_node, &queue);
+ flush_handle_component_node(id_node, comp_node, &queue);
/* Flush to nodes along links. */
op_node = flush_schedule_children(op_node, &queue);
}
diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
index 1d1fe20aba9..a2632c47e7e 100644
--- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
@@ -59,7 +59,7 @@ static bool effect_is_active(bGPdata *gpd, ShaderFxData *fx,
bool is_render)
bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd);
if (((fx->mode & eShaderFxMode_Editmode) == 0) &&
- (is_edit) && (!is_render))
+ (is_edit) && (!is_render))
{
return false;
}
diff --git a/source/blender/draw/intern/draw_armature.c
b/source/blender/draw/intern/draw_armature.c
index b9b2a201c7d..76a48260fc2 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -1235,8 +1235,8 @@ static void draw_points(
if (eBone) {
if (is_envelope_draw) {
drw_shgroup_bone_envelope(
- eBone->disp_mat,
col_solid_root, col_hint_root, col_wire_root,
- &eBone->rad_head,
&envelope_ignore, sh_cfg);
+ eBone->disp_mat, col_solid_root,
col_hint_root, col_wire_root,
+ &eBone->rad_head, &envelope_ignore,
sh_cfg);
}
else {
drw_shgroup_bone_point(eBone->disp_mat,
col_solid_root, col_hint_root, col_wire_root, sh_cfg);
diff --git a/source/blender/draw/intern/draw_cache.c
b/source/blender/draw/intern/draw_cache.c
index f369048ec2f..0256564ffb5 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -3227,7 +3227,8 @@ GPUBatch *DRW_cache_mball_surface_get(Object *ob)
return DRW_metaball_batch_cache_get_triangles_with_normals(ob);
}
-GPUBatch *DRW_cache_mball_edge_detection_get(Object *ob, bool *r_is_manifold) {
+GPUBatch *DRW_cache_mball_edge_detection_get(Object *ob, bool *r_is_manifold)
+{
BLI_assert(ob->type == OB_MBALL);
return DRW_metaball_batch_cache_get_edge_detection(ob, r_is_manifold);
}
diff --git a/source/blender/draw/intern/draw_cache_impl_displist.c
b/source/blender/draw/intern/draw_cache_impl_displist.c
index 4dfe71df36c..9f90ac4fd6c 100644
--- a/source/blender/draw/intern/draw_cache_impl_displist.c
+++ b/source/blender/draw/intern/draw_cache_impl_displist.c
@@ -597,9 +597,9 @@ static void set_edge_adjacency_lines_indices(EdgeHash *eh,
GPUIndexBufBuilder *e
static void set_edges_adjacency_lines_indices(void *thunk, uint v1, uint v2,
uint v3)
{
- void **packed = (void**)thunk;
+ void **packed = (void **)thunk;
GPUIndexBufBuilder *elb = (GPUIndexBufBuilder*)packed[0];
- EdgeHash *eh = (EdgeHash*)packed[1];
+ EdgeHash *eh = (EdgeHash *)packed[1];
bool *r_is_manifold = (bool*)packed[2];
set_edge_adjacency_lines_indices(eh, elb, r_is_manifold, v1, v2, v3);
diff --git a/source/blender/editors/gpencil/gpencil_paint.c
b/source/blender/editors/gpencil/gpencil_paint.c
index df40422e1c1..b66956b090d 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1379,8 +1379,7 @@ static void gp_stroke_soft_refine(bGPDstroke *gps)
for (i = 1; i < gps->totpoints - 1; i++, pt++) {
if (pt->flag & GP_SPOINT_TAG) {
pt2 = &gps->points[i + 1];
- if (((pt2->flag & GP_SPOINT_TAG) == 0))
- {
+ if ((pt2->flag & GP_SPOINT_TAG) == 0) {
pt->flag &= ~GP_SPOINT_TAG;
}
}
@@ -1391,8 +1390,7 @@ static void gp_stroke_soft_refine(bGPDstroke *gps)
for (i = gps->totpoints - 1; i > 0; i--, pt--) {
if (pt->flag & GP_SPOINT_TAG) {
pt2 = &gps->points[i - 1];
- if (((pt2->flag & GP_SPOINT_TAG) == 0))
- {
+ if ((pt2->flag & GP_SPOINT_TAG) == 0) {
pt->flag &= ~GP_SPOINT_TAG;
}
}
diff --git a/source/blender/editors/screen/screen_ops.c
b/source/blender/editors/screen/screen_ops.c
index 06eadedd7b6..ed96621a906 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2317,7 +2317,8 @@ static int area_max_regionsize(ScrArea *sa, ARegion
*scalear, AZEdge edge)
dist -= ar->winx;
}
else if (scalear->alignment == RGN_ALIGN_TOP &&
- (ar->alignment == RGN_ALIGN_BOTTOM ||
ar->regiontype == RGN_TYPE_HEADER)) {
+ (ar->alignment == RGN_ALIGN_BOTTOM ||
ar->regiontype == RGN_TYPE_HEADER))
+ {
dist -= ar->winy;
}
else if (scalear->alignment == RGN_ALIGN_BOTTOM &&
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
