From d169403d968ff172d79ef35763fc46f3c7592e4e Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Wed, 13 Sep 2023 02:25:03 +0200 Subject: [PATCH] Cleanup: Format --- .../editors/animation/keyframes_keylist.cc | 6 +- .../editors/include/ED_grease_pencil.hh | 2 +- .../editors/include/ED_keyframes_draw.hh | 83 +++++++++---------- .../editors/include/ED_keyframes_keylist.hh | 5 +- .../io/usd/intern/usd_reader_material.cc | 3 +- 5 files changed, 50 insertions(+), 49 deletions(-) diff --git a/source/blender/editors/animation/keyframes_keylist.cc b/source/blender/editors/animation/keyframes_keylist.cc index c6dcab51ef4..001b2ad2cd7 100644 --- a/source/blender/editors/animation/keyframes_keylist.cc +++ b/source/blender/editors/animation/keyframes_keylist.cc @@ -1124,9 +1124,9 @@ void fcurve_to_keylist(AnimData *adt, FCurve *fcu, AnimKeylist *keylist, const i } void action_group_to_keylist(AnimData *adt, - bActionGroup *agrp, - AnimKeylist *keylist, - const int saction_flag) + bActionGroup *agrp, + AnimKeylist *keylist, + const int saction_flag) { if (agrp) { /* loop through F-Curves */ diff --git a/source/blender/editors/include/ED_grease_pencil.hh b/source/blender/editors/include/ED_grease_pencil.hh index 3735af478d4..f903f7f2bee 100644 --- a/source/blender/editors/include/ED_grease_pencil.hh +++ b/source/blender/editors/include/ED_grease_pencil.hh @@ -49,7 +49,7 @@ namespace blender::ed::greasepencil { void set_selected_frames_type(bke::greasepencil::Layer &layer, const eBezTriple_KeyframeType key_type); - + /* Creates duplicate frames for each selected frame in the layer. The duplicates are stored in the * LayerTransformData structure of the layer runtime data. This function also unselects the * selected frames, while keeping the duplicates selected. */ diff --git a/source/blender/editors/include/ED_keyframes_draw.hh b/source/blender/editors/include/ED_keyframes_draw.hh index f34747f1eef..7840f1c9617 100644 --- a/source/blender/editors/include/ED_keyframes_draw.hh +++ b/source/blender/editors/include/ED_keyframes_draw.hh @@ -53,69 +53,66 @@ void draw_keyframe_shape(float x, /* Channel Drawing ------------------ */ /* F-Curve */ void ED_add_fcurve_channel(ChannelDrawList *draw_list, - AnimData *adt, - FCurve *fcu, - float ypos, - float yscale_fac, - int saction_flag); + AnimData *adt, + FCurve *fcu, + float ypos, + float yscale_fac, + int saction_flag); /* Action Group Summary */ void ED_add_action_group_channel(ChannelDrawList *draw_list, - AnimData *adt, - bActionGroup *agrp, - float ypos, - float yscale_fac, - int saction_flag); + AnimData *adt, + bActionGroup *agrp, + float ypos, + float yscale_fac, + int saction_flag); /* Action Summary */ void ED_add_action_channel(ChannelDrawList *draw_list, - AnimData *adt, - bAction *act, - float ypos, - float yscale_fac, - int saction_flag); + AnimData *adt, + bAction *act, + float ypos, + float yscale_fac, + int saction_flag); /* Object Summary */ void ED_add_object_channel(ChannelDrawList *draw_list, - bDopeSheet *ads, - Object *ob, - float ypos, - float yscale_fac, - int saction_flag); + bDopeSheet *ads, + Object *ob, + float ypos, + float yscale_fac, + int saction_flag); /* Scene Summary */ void ED_add_scene_channel(ChannelDrawList *draw_list, - bDopeSheet *ads, - Scene *sce, - float ypos, - float yscale_fac, - int saction_flag); -/* DopeSheet Summary */ -void ED_add_summary_channel(ChannelDrawList *draw_list, - bAnimContext *ac, + bDopeSheet *ads, + Scene *sce, float ypos, float yscale_fac, int saction_flag); +/* DopeSheet Summary */ +void ED_add_summary_channel( + ChannelDrawList *draw_list, bAnimContext *ac, float ypos, float yscale_fac, int saction_flag); /* Grease Pencil cels channels */ void ED_add_grease_pencil_cels_channel(ChannelDrawList *draw_list, - bDopeSheet *ads, - const GreasePencilLayer *layer, - float ypos, - float yscale_fac, - int saction_flag); + bDopeSheet *ads, + const GreasePencilLayer *layer, + float ypos, + float yscale_fac, + int saction_flag); /* Grease Pencil layer group channels */ void ED_add_grease_pencil_layer_group_channel(ChannelDrawList *draw_list, - bDopeSheet *ads, - const GreasePencilLayerTreeGroup *layer, - float ypos, - float yscale_fac, - int saction_flag); + bDopeSheet *ads, + const GreasePencilLayerTreeGroup *layer, + float ypos, + float yscale_fac, + int saction_flag); /* Grease Pencil data channels */ void ED_add_grease_pencil_datablock_channel(ChannelDrawList *draw_list, - bDopeSheet *ads, - const GreasePencil *grease_pencil, - const float ypos, - const float yscale_fac, - int saction_flag); + bDopeSheet *ads, + const GreasePencil *grease_pencil, + const float ypos, + const float yscale_fac, + int saction_flag); /* Grease Pencil Layer */ void ED_add_grease_pencil_layer_legacy_channel(ChannelDrawList *draw_list, diff --git a/source/blender/editors/include/ED_keyframes_keylist.hh b/source/blender/editors/include/ED_keyframes_keylist.hh index 08b1c81cbea..fac9317f165 100644 --- a/source/blender/editors/include/ED_keyframes_keylist.hh +++ b/source/blender/editors/include/ED_keyframes_keylist.hh @@ -148,7 +148,10 @@ int64_t ED_keylist_array_len(const AnimKeylist *keylist); /* F-Curve */ void fcurve_to_keylist(AnimData *adt, FCurve *fcu, AnimKeylist *keylist, int saction_flag); /* Action Group */ -void action_group_to_keylist(AnimData *adt, bActionGroup *agrp, AnimKeylist *keylist, int saction_flag); +void action_group_to_keylist(AnimData *adt, + bActionGroup *agrp, + AnimKeylist *keylist, + int saction_flag); /* Action */ void action_to_keylist(AnimData *adt, bAction *act, AnimKeylist *keylist, int saction_flag); /* Object */ diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc index 1a586d92b97..32c81079ccb 100644 --- a/source/blender/io/usd/intern/usd_reader_material.cc +++ b/source/blender/io/usd/intern/usd_reader_material.cc @@ -485,7 +485,8 @@ void USDMaterialReader::set_principled_node_inputs(bNode *principled, set_node_input(coat_input, principled, "Coat", ntree, column, &context); } - if (pxr::UsdShadeInput coat_roughness_input = usd_shader.GetInput(usdtokens::clearcoatRoughness)) { + if (pxr::UsdShadeInput coat_roughness_input = usd_shader.GetInput(usdtokens::clearcoatRoughness)) + { set_node_input(coat_roughness_input, principled, "Coat Roughness", ntree, column, &context); }