[Bf-blender-cvs] [ac447ba1a3f] master: Cleanup: clang-format, trailing space
Campbell Barton
noreply at git.blender.org
Tue Nov 30 00:18:14 CET 2021
Commit: ac447ba1a3f2479f65c9ceddebaafc47681623ba
Author: Campbell Barton
Date: Tue Nov 30 09:18:41 2021 +1100
Branches: master
https://developer.blender.org/rBac447ba1a3f2479f65c9ceddebaafc47681623ba
Cleanup: clang-format, trailing space
===================================================================
M intern/cycles/device/cuda/queue.cpp
M intern/cycles/device/hip/queue.cpp
M intern/cycles/kernel/device/metal/context_begin.h
M intern/cycles/kernel/tables.h
M intern/cycles/test/integrator_tile_test.cpp
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/object.cc
M source/blender/blenkernel/intern/volume.cc
M source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
M source/blender/editors/animation/CMakeLists.txt
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/space_spreadsheet/spreadsheet_panels.cc
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/python/intern/bpy.c
===================================================================
diff --git a/intern/cycles/device/cuda/queue.cpp b/intern/cycles/device/cuda/queue.cpp
index 880d7ca4cf2..ca57882adbf 100644
--- a/intern/cycles/device/cuda/queue.cpp
+++ b/intern/cycles/device/cuda/queue.cpp
@@ -135,7 +135,7 @@ bool CUDADeviceQueue::enqueue(DeviceKernel kernel,
1,
shared_mem_bytes,
cuda_stream_,
- const_cast<void**>(args.values),
+ const_cast<void **>(args.values),
0),
"enqueue");
diff --git a/intern/cycles/device/hip/queue.cpp b/intern/cycles/device/hip/queue.cpp
index 42841324ed6..81b283e8cf5 100644
--- a/intern/cycles/device/hip/queue.cpp
+++ b/intern/cycles/device/hip/queue.cpp
@@ -134,7 +134,7 @@ bool HIPDeviceQueue::enqueue(DeviceKernel kernel,
1,
shared_mem_bytes,
hip_stream_,
- const_cast<void**>(args.values),
+ const_cast<void **>(args.values),
0),
"enqueue");
diff --git a/intern/cycles/kernel/device/metal/context_begin.h b/intern/cycles/kernel/device/metal/context_begin.h
index 2e91e93f088..2eefd795aa1 100644
--- a/intern/cycles/kernel/device/metal/context_begin.h
+++ b/intern/cycles/kernel/device/metal/context_begin.h
@@ -26,7 +26,7 @@ class MetalKernelContext {
MetalKernelContext(constant KernelParamsMetal &_launch_params_metal, constant MetalAncillaries * _metal_ancillaries)
: launch_params_metal(_launch_params_metal), metal_ancillaries(_metal_ancillaries)
{}
-
+
MetalKernelContext(constant KernelParamsMetal &_launch_params_metal)
: launch_params_metal(_launch_params_metal)
{}
diff --git a/intern/cycles/kernel/tables.h b/intern/cycles/kernel/tables.h
index 768033d4ffe..544bf7b7add 100644
--- a/intern/cycles/kernel/tables.h
+++ b/intern/cycles/kernel/tables.h
@@ -73,4 +73,4 @@ ccl_inline_constant float cie_colour_match[][3] = {
{0.0001f, 0.0000f, 0.0000f}, {0.0001f, 0.0000f, 0.0000f}, {0.0000f, 0.0000f, 0.0000f}
};
-/* clang-format on */
\ No newline at end of file
+/* clang-format on */
diff --git a/intern/cycles/test/integrator_tile_test.cpp b/intern/cycles/test/integrator_tile_test.cpp
index 822c34c36bf..1d078a2d19a 100644
--- a/intern/cycles/test/integrator_tile_test.cpp
+++ b/intern/cycles/test/integrator_tile_test.cpp
@@ -25,7 +25,8 @@ TEST(tile_calculate_best_size, Basic)
{
/* Make sure CPU-like case is handled properly. */
EXPECT_EQ(tile_calculate_best_size(false, make_int2(1920, 1080), 1, 1, 1.0f), TileSize(1, 1, 1));
- EXPECT_EQ(tile_calculate_best_size(false, make_int2(1920, 1080), 100, 1, 1.0f), TileSize(1, 1, 1));
+ EXPECT_EQ(tile_calculate_best_size(false, make_int2(1920, 1080), 100, 1, 1.0f),
+ TileSize(1, 1, 1));
/* Enough path states to fit an entire image with all samples. */
EXPECT_EQ(tile_calculate_best_size(false, make_int2(1920, 1080), 1, 1920 * 1080, 1.0f),
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 11b54a27185..dbc418c141c 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -90,10 +90,12 @@ static bool foreach_path_clean_cb(BPathForeachPathData *UNUSED(bpath_data),
/* make sure path names are correct for OS */
static void clean_paths(Main *bmain)
{
- BKE_bpath_foreach_path_main(&(BPathForeachPathData){.bmain = bmain,
- .callback_function = foreach_path_clean_cb,
- .flag = BKE_BPATH_FOREACH_PATH_SKIP_MULTIFILE,
- .user_data = NULL});
+ BKE_bpath_foreach_path_main(&(BPathForeachPathData){
+ .bmain = bmain,
+ .callback_function = foreach_path_clean_cb,
+ .flag = BKE_BPATH_FOREACH_PATH_SKIP_MULTIFILE,
+ .user_data = NULL,
+ });
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
BLI_path_slash_native(scene->r.pic);
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index efb8cdd9c9d..a73a8a75127 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -549,7 +549,8 @@ static void object_foreach_id(ID *id, LibraryForeachIDData *data)
}
}
-static void object_foreach_path_pointcache(ListBase *ptcache_list, BPathForeachPathData *bpath_data)
+static void object_foreach_path_pointcache(ListBase *ptcache_list,
+ BPathForeachPathData *bpath_data)
{
for (PointCache *cache = (PointCache *)ptcache_list->first; cache != nullptr;
cache = cache->next) {
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index c79d4e8cd87..05734aaf77f 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -581,7 +581,8 @@ static void volume_foreach_path(ID *id, BPathForeachPathData *bpath_data)
{
Volume *volume = reinterpret_cast<Volume *>(id);
- if (volume->packedfile != nullptr && (bpath_data->flag & BKE_BPATH_FOREACH_PATH_SKIP_PACKED) != 0) {
+ if (volume->packedfile != nullptr &&
+ (bpath_data->flag & BKE_BPATH_FOREACH_PATH_SKIP_PACKED) != 0) {
return;
}
diff --git a/source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
index c09365cdcb4..db9ae0f7034 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
@@ -2,8 +2,8 @@
/**
* Gather pass: Convolve foreground and background parts in separate passes.
*
- * Using the min&max CoC tile buffer, we select the best appropriate method to blur the scene color.
- * A fast gather path is taken if there is not many CoC variation inside the tile.
+ * Using the min&max CoC tile buffer, we select the best appropriate method to blur the scene
+ * color. A fast gather path is taken if there is not many CoC variation inside the tile.
*
* We sample using an octaweb sampling pattern. We randomize the kernel center and each ring
* rotation to ensure maximum coverage.
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index 808593ef1c5..6fa4d94df3a 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -81,4 +81,4 @@ if(WITH_GTESTS)
)
include(GTestTesting)
blender_add_test_lib(bf_editor_animation_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
-endif()
\ No newline at end of file
+endif()
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index ce6fbac1c0e..2d549f6176c 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -351,7 +351,6 @@ typedef struct uiButProgressbar {
float progress;
} uiButProgressbar;
-
/** Derived struct for #UI_BTYPE_TREEROW. */
typedef struct uiButTreeRow {
uiBut but;
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 7c24463fe5b..bbd006d30c9 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -4572,7 +4572,6 @@ static uiWidgetType *widget_type(uiWidgetTypeEnum type)
wt.custom = widget_progressbar;
break;
-
case UI_WTYPE_TREEROW:
wt.custom = widget_treerow;
break;
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_panels.cc b/source/blender/editors/space_spreadsheet/spreadsheet_panels.cc
index 8f923ea4a63..854c3d4aba6 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_panels.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_panels.cc
@@ -34,4 +34,4 @@ void spreadsheet_data_set_region_panels_register(ARegionType ®ion_type)
BLI_addtail(®ion_type.paneltypes, panel_type);
}
-} // namespace blender::ed::spreadsheet
\ No newline at end of file
+} // namespace blender::ed::spreadsheet
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index f92043995dd..9be66a6553b 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -2272,7 +2272,8 @@ static void rna_def_filter_video(StructRNA *srna)
prop = RNA_def_property(srna, "use_reverse_frames", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_REVERSE_FRAMES);
RNA_def_property_ui_text(prop, "Reverse Frames", "Reverse frame order");
- RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update");
+ RNA_def_property_update(
+ prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update");
prop = RNA_def_property(srna, "color_multiply", PROP_FLOAT, PROP_UNSIGNED);
RNA_def_property_float_sdna(prop, NULL, "mul");
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index 22d54ad72ba..152b08f5085 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -151,10 +151,12 @@ static PyObject *bpy_blend_paths(PyObject *UNUSED(self), PyObject *args, PyObjec
list = PyList_New(0);
- BKE_bpath_foreach_path_main(&(BPathForeachPathData){.bmain = G_MAIN,
- .callback_function = bpy_blend_foreach_path_cb,
- .flag = flag,
- .user_data = list});
+ BKE_bpath_foreach_path_main(&(BPathForeachPathData){
+ .bmain = G_MAIN,
+ .callback_function = bpy_blend_foreach_path_cb,
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list