archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Clang format

Browse Source
This commit is contained in:
Hans Goudey
2021-05-13 17:37:51 -05:00
parent 2953732fc5
commit 88aee2986f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/node.cc
View File

@@ -2305,8 +2305,8 @@ bNodeLink *nodeAddLink(
ntree->update |= NTREE_UPDATE_LINKS; ntree->update |= NTREE_UPDATE_LINKS;
} }
if(link->tosock->flag & SOCK_MULTI_INPUT){ if (link->tosock->flag & SOCK_MULTI_INPUT) {
link->multi_input_socket_index = node_count_links(ntree,link->tosock) - 1; link->multi_input_socket_index = node_count_links(ntree, link->tosock) - 1;
} }
return link; return link;

5
source/blender/io/collada/Materials.cpp
View File

@@ -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); 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 *from_socket = nodeFindSocket(from_node, SOCK_OUT, from_label);
bNodeSocket *to_socket = nodeFindSocket(to_node, SOCK_IN, to_label); bNodeSocket *to_socket = nodeFindSocket(to_node, SOCK_IN, to_label);

2
source/blender/io/collada/Materials.h
View File

@@ -48,7 +48,7 @@ class MaterialNode {
bNodeTree *prepare_material_nodetree(); bNodeTree *prepare_material_nodetree();
bNode *add_node(int node_type, int locx, int locy, std::string label); 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, 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); bNode *add_texture_node(COLLADAFW::ColorOrTexture &cot, int locx, int locy, std::string label);
void setShaderType(); void setShaderType();