[Bf-blender-cvs] [1d8f2aeb740] temp-pbvh-split: Cleanup: format

Campbell Barton noreply at git.blender.org
Fri Jun 3 01:16:25 CEST 2022


Commit: 1d8f2aeb740dd820bdf847c93317c11e6897d84b
Author: Campbell Barton
Date:   Wed May 11 09:50:54 2022 +1000
Branches: temp-pbvh-split
https://developer.blender.org/rB1d8f2aeb740dd820bdf847c93317c11e6897d84b

Cleanup: format

===================================================================

M	doc/python_api/examples/bpy.types.Image.py
M	source/blender/editors/sculpt_paint/sculpt_filter_color.c
M	source/blender/gpencil_modifiers/CMakeLists.txt
M	source/blender/io/common/CMakeLists.txt
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/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/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index f87c85f808f..69fc26c99e9 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -72,7 +72,6 @@ set(SRC
 
   intern/lineart/MOD_lineart.h
   intern/lineart/lineart_intern.h
-
 )
 
 if(WITH_TBB)
diff --git a/source/blender/io/common/CMakeLists.txt b/source/blender/io/common/CMakeLists.txt
index 95ffbe19ada..e80bd850825 100644
--- a/source/blender/io/common/CMakeLists.txt
+++ b/source/blender/io/common/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../depsgraph
   ../../makesdna
   ../../../../intern/guardedalloc
-
 )
 
 set(INC_SYS
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>> &copy_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 1b5536c755e..b3d4ae80713 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -6426,7 +6426,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