[Bf-blender-cvs] [88aee2986fe] master: Cleanup: Clang format

Hans Goudey noreply at git.blender.org
Fri May 14 00:37:58 CEST 2021


Commit: 88aee2986fe2ae5b9d6d33f38aa638ebcd70928c
Author: Hans Goudey
Date:   Thu May 13 17:37:51 2021 -0500
Branches: master
https://developer.blender.org/rB88aee2986fe2ae5b9d6d33f38aa638ebcd70928c

Cleanup: Clang format

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

M	source/blender/blenkernel/intern/node.cc
M	source/blender/io/collada/Materials.cpp
M	source/blender/io/collada/Materials.h

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 3d49d186e01..96a06f6e2de 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -2305,8 +2305,8 @@ bNodeLink *nodeAddLink(
     ntree->update |= NTREE_UPDATE_LINKS;
   }
 
-  if(link->tosock->flag & SOCK_MULTI_INPUT){
-    link->multi_input_socket_index = node_count_links(ntree,link->tosock) - 1;
+  if (link->tosock->flag & SOCK_MULTI_INPUT) {
+    link->multi_input_socket_index = node_count_links(ntree, link->tosock) - 1;
   }
 
   return link;
diff --git a/source/blender/io/collada/Materials.cpp b/source/blender/io/collada/Materials.cpp
index 35f1b82a71f..c7244575752 100644
--- a/source/blender/io/collada/Materials.cpp
+++ b/source/blender/io/collada/Materials.cpp
@@ -133,7 +133,10 @@ void MaterialNode::add_link(bNode *from_node, int from_index, bNode *to_node, in
   nodeAddLink(ntree, from_node, from_socket, to_node, to_socket);
 }
 
-void MaterialNode::add_link(bNode *from_node, const char* from_label, bNode *to_node, const char* to_label)
+void MaterialNode::add_link(bNode *from_node,
+                            const char *from_label,
+                            bNode *to_node,
+                            const char *to_label)
 {
   bNodeSocket *from_socket = nodeFindSocket(from_node, SOCK_OUT, from_label);
   bNodeSocket *to_socket = nodeFindSocket(to_node, SOCK_IN, to_label);
diff --git a/source/blender/io/collada/Materials.h b/source/blender/io/collada/Materials.h
index 431c309467a..1886acb7a6a 100644
--- a/source/blender/io/collada/Materials.h
+++ b/source/blender/io/collada/Materials.h
@@ -48,7 +48,7 @@ class MaterialNode {
   bNodeTree *prepare_material_nodetree();
   bNode *add_node(int node_type, int locx, int locy, std::string label);
   void add_link(bNode *from_node, int from_index, bNode *to_node, int to_index);
-  void add_link(bNode *from_node, const char* from_label, bNode *to_node, const char* to_label);
+  void add_link(bNode *from_node, const char *from_label, bNode *to_node, const char *to_label);
   bNode *add_texture_node(COLLADAFW::ColorOrTexture &cot, int locx, int locy, std::string label);
   void setShaderType();



More information about the Bf-blender-cvs mailing list