[Bf-blender-cvs] [ffbeb34f5fa] blender-v3.2-release: Cleanup: format
Campbell Barton
noreply at git.blender.org
Wed May 18 04:18:15 CEST 2022
Commit: ffbeb34f5faa8d0d5d5adb946bc8686e1f638fba
Author: Campbell Barton
Date: Wed May 18 12:17:42 2022 +1000
Branches: blender-v3.2-release
https://developer.blender.org/rBffbeb34f5faa8d0d5d5adb946bc8686e1f638fba
Cleanup: format
===================================================================
M doc/python_api/examples/bpy.types.Image.py
M intern/cycles/kernel/integrator/mnee.h
M source/blender/bmesh/intern/bmesh_log.c
M source/blender/editors/sculpt_paint/sculpt_filter_color.c
M source/blender/gpu/intern/gpu_capabilities.cc
M source/blender/io/common/IO_path_util.hh
M source/blender/io/common/intern/path_util.cc
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/doc/python_api/examples/bpy.types.Image.py b/doc/python_api/examples/bpy.types.Image.py
index 715623f6f76..f0c1a780e24 100644
--- a/doc/python_api/examples/bpy.types.Image.py
+++ b/doc/python_api/examples/bpy.types.Image.py
@@ -44,4 +44,3 @@ image_dest = image_src.copy()
image_dest.update()
print(image_dest.size)
print(image_dest.pixels[0:4])
-
diff --git a/intern/cycles/kernel/integrator/mnee.h b/intern/cycles/kernel/integrator/mnee.h
index e924f408d59..ad83f82d091 100644
--- a/intern/cycles/kernel/integrator/mnee.h
+++ b/intern/cycles/kernel/integrator/mnee.h
@@ -534,14 +534,8 @@ ccl_device_forceinline bool mnee_newton_solver(KernelGlobals kg,
tv.dp_dv = mv.dp_dv;
/* Setup corrected manifold vertex. */
- mnee_setup_manifold_vertex(kg,
- &tv,
- mv.bsdf,
- mv.eta,
- mv.n_offset,
- &projection_ray,
- &projection_isect,
- sd_vtx);
+ mnee_setup_manifold_vertex(
+ kg, &tv, mv.bsdf, mv.eta, mv.n_offset, &projection_ray, &projection_isect, sd_vtx);
/* Fail newton solve if we are not making progress, probably stuck trying to move off the
* edge of the mesh. */
@@ -1038,8 +1032,7 @@ ccl_device_forceinline int kernel_path_mnee_sample(KernelGlobals kg,
}
/* Setup differential geometry on vertex. */
- mnee_setup_manifold_vertex(
- kg, &mv, bsdf, eta, h, &probe_ray, &probe_isect, sd_mnee);
+ mnee_setup_manifold_vertex(kg, &mv, bsdf, eta, h, &probe_ray, &probe_isect, sd_mnee);
break;
}
}
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index a55eb74285d..a81ae934629 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -304,7 +304,7 @@ static void bm_log_faces_restore(BMesh *bm, BMLog *log, GHash *faces)
f->head.hflag = lf->hflag;
bm_log_face_id_set(log, f, POINTER_AS_UINT(key));
- /* Ensure face sets have valid values. Fixes T80174. */
+ /* Ensure face sets have valid values. Fixes T80174. */
if (cd_face_sets != -1) {
BM_ELEM_CD_SET_INT(f, cd_face_sets, 1);
}
diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.c b/source/blender/editors/sculpt_paint/sculpt_filter_color.c
index 9bddc2ad855..f71a814aff4 100644
--- a/source/blender/editors/sculpt_paint/sculpt_filter_color.c
+++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.c
@@ -125,7 +125,7 @@ static void color_filter_task_cb(void *__restrict userdata,
case COLOR_FILTER_HUE:
rgb_to_hsv_v(orig_color, hsv_color);
hue = hsv_color[0];
- hsv_color[0] = fmod((hsv_color[0] + fabs(fade)) - hue,1);
+ hsv_color[0] = fmod((hsv_color[0] + fabs(fade)) - hue, 1);
hsv_to_rgb_v(hsv_color, final_color);
break;
case COLOR_FILTER_SATURATION:
diff --git a/source/blender/gpu/intern/gpu_capabilities.cc b/source/blender/gpu/intern/gpu_capabilities.cc
index 6ef015492c7..4ec215c2d3b 100644
--- a/source/blender/gpu/intern/gpu_capabilities.cc
+++ b/source/blender/gpu/intern/gpu_capabilities.cc
@@ -172,7 +172,6 @@ int GPU_max_compute_shader_storage_blocks()
return GCaps.max_compute_shader_storage_blocks;
}
-
/** \} */
/* -------------------------------------------------------------------- */
diff --git a/source/blender/io/common/IO_path_util.hh b/source/blender/io/common/IO_path_util.hh
index ac2f935523e..eeb5a9dbcfe 100644
--- a/source/blender/io/common/IO_path_util.hh
+++ b/source/blender/io/common/IO_path_util.hh
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
-#include "BLI_string_ref.hh"
#include "BLI_set.hh"
+#include "BLI_string_ref.hh"
#include "IO_path_util_types.h"
@@ -14,7 +14,7 @@ namespace blender::io {
*
* When PATH_REFERENCE_COPY mode is used, the file path pair (source
* path, destination path) is added to the `copy_set`.
- *
+ *
* Equivalent of bpy_extras.io_utils.path_reference.
*/
std::string path_reference(StringRefNull filepath,
@@ -26,4 +26,4 @@ std::string path_reference(StringRefNull filepath,
/** Execute copying files of path_reference. */
void path_reference_copy(const Set<std::pair<std::string, std::string>> ©_set);
-} // namespace blender::io
+} // namespace blender::io
diff --git a/source/blender/io/common/intern/path_util.cc b/source/blender/io/common/intern/path_util.cc
index 2b9a1d67b44..902cf552bf0 100644
--- a/source/blender/io/common/intern/path_util.cc
+++ b/source/blender/io/common/intern/path_util.cc
@@ -28,7 +28,8 @@ std::string path_reference(StringRefNull filepath,
}
else if (mode == PATH_REFERENCE_COPY) {
char filepath_cpy[PATH_MAX];
- BLI_path_join(filepath_cpy, PATH_MAX, base_dst.c_str(), BLI_path_basename(filepath_abs), nullptr);
+ BLI_path_join(
+ filepath_cpy, PATH_MAX, base_dst.c_str(), BLI_path_basename(filepath_abs), nullptr);
copy_set->add(std::make_pair(filepath_abs, filepath_cpy));
BLI_strncpy(filepath_abs, filepath_cpy, PATH_MAX);
mode = PATH_REFERENCE_RELATIVE;
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 053353b41ba..6f57e2755ee 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -6410,7 +6410,8 @@ static void rna_def_userdef_experimental(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_draw_manager_acquire_lock", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "use_draw_manager_acquire_lock", 1);
- RNA_def_property_ui_text(prop, "Draw Manager Locking", "Don't lock UI during background rendering");
+ RNA_def_property_ui_text(
+ prop, "Draw Manager Locking", "Don't lock UI during background rendering");
prop = RNA_def_property(srna, "use_extended_asset_browser", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_ui_text(prop,
More information about the Bf-blender-cvs
mailing list