[Bf-blender-cvs] [ffb6cc263fe] blender-v3.3-release: Cleanup: format

Campbell Barton noreply at git.blender.org
Tue Aug 23 15:05:21 CEST 2022


Commit: ffb6cc263fe13e6cc75561b5dc8850f1d31faf0f
Author: Campbell Barton
Date:   Tue Aug 23 22:55:05 2022 +1000
Branches: blender-v3.3-release
https://developer.blender.org/rBffb6cc263fe13e6cc75561b5dc8850f1d31faf0f

Cleanup: format

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

M	release/scripts/startup/bl_ui/space_image.py
M	release/scripts/startup/bl_ui/space_outliner.py
M	source/blender/editors/gpencil/gpencil_primitive.c
M	source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
M	source/blender/nodes/shader/nodes/node_shader_math.cc

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

diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 6a231c74cd9..0f51c3830eb 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -34,6 +34,7 @@ from bpy.app.translations import (
     pgettext_iface as iface_,
 )
 
+
 class ImagePaintPanel:
     bl_space_type = 'IMAGE_EDITOR'
     bl_region_type = 'UI'
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 2a2d67d78a4..dc4eea13ce3 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -7,6 +7,7 @@ from bpy.app.translations import (
     pgettext_iface as iface_,
 )
 
+
 class OUTLINER_HT_header(Header):
     bl_space_type = 'OUTLINER'
 
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index eb4243c0053..4a4fffc9638 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -19,7 +19,6 @@
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
-#include "BLT_translation.h"
 #include "BLT_translation.h"
 
 #include "PIL_time.h"
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
index a863111b165..093cbec32fe 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
@@ -95,9 +95,7 @@ static Image *create_placeholder_image(Main *bmain, const std::string &path)
   return image;
 }
 
-static Image *load_texture_image(Main *bmain,
-                                 const tex_map_XX &tex_map,
-                                 bool relative_paths)
+static Image *load_texture_image(Main *bmain, const tex_map_XX &tex_map, bool relative_paths)
 {
   Image *image = nullptr;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_math.cc b/source/blender/nodes/shader/nodes/node_shader_math.cc
index beacde899c3..73ee6fb3f85 100644
--- a/source/blender/nodes/shader/nodes/node_shader_math.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_math.cc
@@ -61,8 +61,9 @@ static void sh_node_math_gather_link_searches(GatherLinkSearchOpParams &params)
            ELEM(item->value, NODE_MATH_COMPARE, NODE_MATH_GREATER_THAN, NODE_MATH_LESS_THAN)) ?
               -1 :
               weight;
-      params.add_item(
-              CTX_IFACE_(BLT_I18NCONTEXT_ID_NODETREE, item->name), SocketSearchOp{"Value", (NodeMathOperation)item->value}, gn_weight);
+      params.add_item(CTX_IFACE_(BLT_I18NCONTEXT_ID_NODETREE, item->name),
+                      SocketSearchOp{"Value", (NodeMathOperation)item->value},
+                      gn_weight);
     }
   }
 }



More information about the Bf-blender-cvs mailing list