[Bf-blender-cvs] [16adfff1c67] master: Cleanup: make format

Jacques Lucke noreply at git.blender.org
Thu Sep 1 20:00:02 CEST 2022


Commit: 16adfff1c67a85ef52ed2a97261a6e63df8abb26
Author: Jacques Lucke
Date:   Thu Sep 1 19:59:55 2022 +0200
Branches: master
https://developer.blender.org/rB16adfff1c67a85ef52ed2a97261a6e63df8abb26

Cleanup: make format

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

M	source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc
M	source/blender/compositor/nodes/COM_GlareNode.cc
M	source/blender/compositor/nodes/COM_SunBeamsNode.cc
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/gpu/intern/gpu_vertex_format.cc
M	source/blender/python/gpu/gpu_py_shader.h

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

diff --git a/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc b/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc
index 938ee80f4bd..7d557de66e4 100644
--- a/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc
+++ b/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc
@@ -27,7 +27,7 @@ ConvertColorSpaceNode::ConvertColorSpaceNode(bNode *editorNode) : Node(editorNod
 void ConvertColorSpaceNode::convert_to_operations(NodeConverter &converter,
                                                   const CompositorContext &UNUSED(context)) const
 {
- const bNode *b_node = get_bnode();
+  const bNode *b_node = get_bnode();
 
   NodeInput *inputSocketImage = this->get_input_socket(0);
   NodeOutput *outputSocketImage = this->get_output_socket(0);
@@ -50,7 +50,7 @@ void ConvertColorSpaceNode::convert_to_operations(NodeConverter &converter,
 
 bool ConvertColorSpaceNode::performs_conversion(NodeConvertColorSpace &settings) const
 {
- const bNode *b_node = get_bnode();
+  const bNode *b_node = get_bnode();
 
   if (IMB_colormanagement_space_name_is_data(settings.from_color_space)) {
     CLOG_INFO(&LOG,
diff --git a/source/blender/compositor/nodes/COM_GlareNode.cc b/source/blender/compositor/nodes/COM_GlareNode.cc
index eec05482655..d80e6f9543f 100644
--- a/source/blender/compositor/nodes/COM_GlareNode.cc
+++ b/source/blender/compositor/nodes/COM_GlareNode.cc
@@ -21,7 +21,7 @@ void GlareNode::convert_to_operations(NodeConverter &converter,
                                       const CompositorContext & /*context*/) const
 {
   const bNode *node = this->get_bnode();
-const  NodeGlare *glare = (const NodeGlare *)node->storage;
+  const NodeGlare *glare = (const NodeGlare *)node->storage;
 
   GlareBaseOperation *glareoperation = nullptr;
   switch (glare->type) {
diff --git a/source/blender/compositor/nodes/COM_SunBeamsNode.cc b/source/blender/compositor/nodes/COM_SunBeamsNode.cc
index ff154d9014e..c33d9d0faf5 100644
--- a/source/blender/compositor/nodes/COM_SunBeamsNode.cc
+++ b/source/blender/compositor/nodes/COM_SunBeamsNode.cc
@@ -16,7 +16,7 @@ void SunBeamsNode::convert_to_operations(NodeConverter &converter,
 {
   NodeInput *input_socket = this->get_input_socket(0);
   NodeOutput *output_socket = this->get_output_socket(0);
- const NodeSunBeams *data = (const NodeSunBeams *)get_bnode()->storage;
+  const NodeSunBeams *data = (const NodeSunBeams *)get_bnode()->storage;
 
   SunBeamsOperation *operation = new SunBeamsOperation();
   operation->set_data(*data);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index d25adc279d7..ca3e4543a23 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -1218,8 +1218,12 @@ void DepsgraphNodeBuilder::build_driver_id_property(ID *id, const char *rna_path
   /* Custom properties of bones are placed in their components to improve granularity. */
   if (RNA_struct_is_a(ptr.type, &RNA_PoseBone)) {
     const bPoseChannel *pchan = static_cast<const bPoseChannel *>(ptr.data);
-    ensure_operation_node(
-        ptr.owner_id, NodeType::BONE, pchan->name, OperationCode::ID_PROPERTY, nullptr, prop_identifier);
+    ensure_operation_node(ptr.owner_id,
+                          NodeType::BONE,
+                          pchan->name,
+                          OperationCode::ID_PROPERTY,
+                          nullptr,
+                          prop_identifier);
   }
   else {
     ensure_operation_node(
diff --git a/source/blender/gpu/intern/gpu_vertex_format.cc b/source/blender/gpu/intern/gpu_vertex_format.cc
index 2463dc2ae06..c16c06c1421 100644
--- a/source/blender/gpu/intern/gpu_vertex_format.cc
+++ b/source/blender/gpu/intern/gpu_vertex_format.cc
@@ -402,7 +402,7 @@ void GPU_vertformat_from_shader(GPUVertFormat *format, const struct GPUShader *g
   GPU_vertformat_clear(format);
 
   uint attr_len = GPU_shader_get_attribute_len(gpushader);
-  int location_test = 0, attrs_added = 0;;
+  int location_test = 0, attrs_added = 0;
   while (attrs_added < attr_len) {
     char name[256];
     Type gpu_type;
diff --git a/source/blender/python/gpu/gpu_py_shader.h b/source/blender/python/gpu/gpu_py_shader.h
index 82d83d5716a..ba40636981f 100644
--- a/source/blender/python/gpu/gpu_py_shader.h
+++ b/source/blender/python/gpu/gpu_py_shader.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #ifndef __cplusplus
-#include "../generic/py_capi_utils.h"
+#  include "../generic/py_capi_utils.h"
 #endif
 
 /* Make sure that there is always a reference count for PyObjects of type String as the strings are



More information about the Bf-blender-cvs mailing list