archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2019-04-04 08:13:13 +11:00
parent 2933fd6c7c
commit 22bc9fb4a9
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
View File

@@ -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);
}

2
source/blender/draw/engines/gpencil/gpencil_shader_fx.c
View File

@@ -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;
}

4
source/blender/draw/intern/draw_armature.c
View File

@@ -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);

3
source/blender/draw/intern/draw_cache.c
View File

@@ -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);
}

4
source/blender/draw/intern/draw_cache_impl_displist.c
View File

@@ -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);

6
source/blender/editors/gpencil/gpencil_paint.c
View File

@@ -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;
}
}

3
source/blender/editors/screen/screen_ops.c
View File

@@ -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 &&