diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-08-25 08:59:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-25 09:45:47 +0300 |
| commit | f1ddc6ed0abd1821e96bb8183d4ea1ff57589ec6 (patch) | |
| tree | 433f059ec67e8d46292c69c34bc79aecd2a82d12 /source/blender | |
| parent | 8df66731656b9141f2b3df673422f25e321b2300 (diff) | |
Cleanup: clang-format
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/compositor/operations/COM_MixOperation.cpp | 5 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 3 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_MixOperation.cpp b/source/blender/compositor/operations/COM_MixOperation.cpp index ae1acd1cad0..6b8a0caa13b 100644 --- a/source/blender/compositor/operations/COM_MixOperation.cpp +++ b/source/blender/compositor/operations/COM_MixOperation.cpp @@ -167,7 +167,10 @@ MixColorBurnOperation::MixColorBurnOperation() : MixBaseOperation() /* pass */ } -void MixColorBurnOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) +void MixColorBurnOperation::executePixelSampled(float output[4], + float x, + float y, + PixelSampler sampler) { float inputColor1[4]; float inputColor2[4]; diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 85c7af26b72..529cb0712df 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1873,7 +1873,8 @@ void uiItemFullR(uiLayout *layout, uiBut *but; } ui_decorate = { .use_prop_decorate = (((layout->item.flag & UI_ITEM_PROP_DECORATE) != 0) && - (use_prop_sep && ptr->owner_id && id_can_have_animdata(ptr->owner_id))), + (use_prop_sep && ptr->owner_id && + id_can_have_animdata(ptr->owner_id))), }; #endif /* UI_PROP_DECORATE */ diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 8215988c849..8546290d281 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -2884,7 +2884,6 @@ static uiBlock *block_create_autorun_warning(struct bContext *C, } UI_but_drawflag_disable(but, UI_BUT_TEXT_LEFT); - col = uiLayoutColumn(split, false); but = uiDefIconTextBut(block, UI_BTYPE_BUT, |