From a245d533514e335f028cfa6cdb26614ed0982484 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 6 Feb 2019 09:14:11 +1100 Subject: Cleanup: style --- source/blender/blenkernel/intern/anim_sys.c | 4 ++-- source/blender/blenkernel/intern/layer.c | 2 +- source/blender/blenkernel/intern/mask.c | 2 +- source/blender/blenkernel/intern/movieclip.c | 2 +- source/blender/editors/space_outliner/outliner_collections.c | 6 ++++-- 5 files changed, 9 insertions(+), 7 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 6b11d146837..b4706026167 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -447,7 +447,7 @@ void action_move_fcurves_by_basepath(bAction *srcAct, bAction *dstAct, const cha if (ELEM(NULL, srcAct, dstAct, basepath)) { if (G.debug & G_DEBUG) { CLOG_ERROR(&LOG, "srcAct: %p, dstAct: %p, basepath: %p has insufficient info to work with", - (void *)srcAct, (void *)dstAct, (void *)basepath); + (void *)srcAct, (void *)dstAct, (void *)basepath); } return; } @@ -550,7 +550,7 @@ void BKE_animdata_separate_by_basepath( } else if (dstAdt->action == srcAdt->action) { CLOG_WARN(&LOG, "Argh! Source and Destination share animation! " - "('%s' and '%s' both use '%s') Making new empty action", + "('%s' and '%s' both use '%s') Making new empty action", srcID->name, dstID->name, srcAdt->action->id.name); /* TODO: review this... */ diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index f9d39c840e2..d9f0d3ccee4 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -711,7 +711,7 @@ static short layer_collection_sync( base->flag |= BASE_VISIBLE; if (((child_restrict & COLLECTION_RESTRICT_SELECT) == 0) && - ((object_restrict & OB_RESTRICT_SELECT) == 0)) + ((object_restrict & OB_RESTRICT_SELECT) == 0)) { base->flag |= BASE_SELECTABLE; } diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 4893a7974c6..436c05c9feb 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -1486,7 +1486,7 @@ void BKE_mask_layer_shape_from_mask(MaskLayer *masklay, MaskLayerShape *masklay_ } else { CLOG_ERROR(&LOG, "vert mismatch %d != %d (frame %d)", - masklay_shape->tot_vert, tot, masklay_shape->frame); + masklay_shape->tot_vert, tot, masklay_shape->frame); } } diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index b67a39494c3..0b0d20ed435 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -239,7 +239,7 @@ static void movieclip_convert_multilayer_add_pass( } if (STREQ(pass_name, RE_PASSNAME_COMBINED) || STREQ(chan_id, "RGBA") || - STREQ(chan_id, "RGB")) + STREQ(chan_id, "RGB")) { ctx->combined_pass = rect; ctx->num_combined_channels = num_channels; diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 0d8c88ecede..c8bc62cd23f 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -822,7 +822,8 @@ void OUTLINER_OT_collection_indirect_only_clear(wmOperatorType *ot) /************************** Visibility Operators ******************************/ -static int collection_isolate_exec(bContext *C, wmOperator *op) { +static int collection_isolate_exec(bContext *C, wmOperator *op) +{ Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); SpaceOops *soops = CTX_wm_space_outliner(C); @@ -906,7 +907,8 @@ static bool collection_inside_poll(bContext *C) return outliner_active_layer_collection(C) != NULL; } -static int collection_visibility_exec(bContext *C, wmOperator *op) { +static int collection_visibility_exec(bContext *C, wmOperator *op) +{ Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); SpaceOops *soops = CTX_wm_space_outliner(C); -- cgit v1.2.3