From adae93281cec11e1b41e3c6c83d77827824eda40 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 5 Sep 2019 12:56:34 +1000 Subject: Cleanup: clang-format --- source/blender/blenlib/BLI_array.h | 3 ++- source/blender/editors/include/ED_fileselect.h | 2 +- source/blender/makesrna/intern/rna_space.c | 6 +++++- source/blender/makesrna/intern/rna_userdef.c | 3 ++- source/blender/nodes/CMakeLists.txt | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/source/blender/blenlib/BLI_array.h b/source/blender/blenlib/BLI_array.h index d687838a896..57e1790fdfd 100644 --- a/source/blender/blenlib/BLI_array.h +++ b/source/blender/blenlib/BLI_array.h @@ -83,7 +83,8 @@ void _bli_array_grow_func(void **arr_p, ((void *)(_##arr##_static) != \ NULL) && /* don't add _##arr##_len below because it must be zero */ \ (_bli_array_totalsize_static(arr) >= \ - (size_t)(_##arr##_len + (num)))) ? /* we have an empty array and a static var big enough */ \ + (size_t)(_##arr##_len + \ + (num)))) ? /* we have an empty array and a static var big enough */ \ (void)(arr = (void *)_##arr##_static) : /* use existing static array or allocate */ \ (LIKELY(_bli_array_totalsize(arr) >= (size_t)(_##arr##_len + (num))) ? \ (void)0 /* do nothing */ : \ diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h index dc42237d804..fd7aada1b9f 100644 --- a/source/blender/editors/include/ED_fileselect.h +++ b/source/blender/editors/include/ED_fileselect.h @@ -90,8 +90,8 @@ typedef struct FileSelection { int last; } FileSelection; -struct rcti; struct View2D; +struct rcti; struct FileSelectParams *ED_fileselect_get_params(struct SpaceFile *sfile); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 18c9450104f..727745e69dd 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -390,7 +390,11 @@ static const EnumPropertyItem buttons_context_items[] = { {BCONTEXT_VIEW_LAYER, "VIEW_LAYER", ICON_RENDER_RESULT, "View Layer", "View Layer Properties"}, {BCONTEXT_WORLD, "WORLD", ICON_WORLD, "World", "World Properties"}, {BCONTEXT_OBJECT, "OBJECT", ICON_OBJECT_DATA, "Object", "Object Properties"}, - {BCONTEXT_CONSTRAINT, "CONSTRAINT", ICON_CONSTRAINT, "Constraints", "Object Constraint Properties"}, + {BCONTEXT_CONSTRAINT, + "CONSTRAINT", + ICON_CONSTRAINT, + "Constraints", + "Object Constraint Properties"}, {BCONTEXT_MODIFIER, "MODIFIER", ICON_MODIFIER, "Modifiers", "Modifier Properties"}, {BCONTEXT_DATA, "DATA", ICON_NONE, "Data", "Object Data Properties"}, {BCONTEXT_BONE, "BONE", ICON_BONE_DATA, "Bone", "Bone Properties"}, diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 7c6247180a3..37fee576fde 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -4112,7 +4112,8 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "show_addons_enabled_only", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "space_data.flag", USER_SPACEDATA_ADDONS_SHOW_ONLY_ENABLED); + RNA_def_property_boolean_sdna( + prop, NULL, "space_data.flag", USER_SPACEDATA_ADDONS_SHOW_ONLY_ENABLED); RNA_def_property_ui_text(prop, "Enabled Add-ons Only", "Only show enabled add-ons. Un-check to see all installed add-ons"); diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 5cf5e1ac6d3..ea2968f4917 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -205,9 +205,9 @@ set(SRC shader/nodes/node_shader_uvmap.c shader/nodes/node_shader_valToRgb.c shader/nodes/node_shader_value.c - shader/nodes/node_shader_vector_math.c shader/nodes/node_shader_vectTransform.c shader/nodes/node_shader_vector_displacement.c + shader/nodes/node_shader_vector_math.c shader/nodes/node_shader_volume_absorption.c shader/nodes/node_shader_volume_info.c shader/nodes/node_shader_volume_principled.c -- cgit v1.2.3