Commit: 4924f8cffd4522f46161258ff33cf036a5a11eae Author: Chris Blackbourn Date: Mon Jan 2 11:53:40 2023 +1300 Branches: master https://developer.blender.org/rB4924f8cffd4522f46161258ff33cf036a5a11eae
Cleanup: format =================================================================== M source/blender/blenkernel/intern/node.cc M source/blender/blenloader/intern/versioning_common.h M source/blender/editors/space_node/drawnode.cc =================================================================== diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 3cd0cf2f7ca..69d2b2a12e6 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -3558,8 +3558,6 @@ void nodeSetActive(bNodeTree *ntree, bNode *node) node->flag |= flags_to_set; } - - void nodeSetSocketAvailability(bNodeTree *ntree, bNodeSocket *sock, bool is_available) { const bool was_available = (sock->flag & SOCK_UNAVAIL) == 0; diff --git a/source/blender/blenloader/intern/versioning_common.h b/source/blender/blenloader/intern/versioning_common.h index c99fb60be30..40f383a27b2 100644 --- a/source/blender/blenloader/intern/versioning_common.h +++ b/source/blender/blenloader/intern/versioning_common.h @@ -88,8 +88,8 @@ struct bNodeSocket *version_node_add_socket_if_not_exist(struct bNodeTree *ntree const char *name); /** - * The versioning code generally expects `SOCK_IS_LINKED` to be set correctly. This function updates - * the flag on all sockets after changes to the node tree. + * The versioning code generally expects `SOCK_IS_LINKED` to be set correctly. This function + * updates the flag on all sockets after changes to the node tree. */ void version_socket_update_is_used(bNodeTree *ntree); ARegion *do_versions_add_region(int regiontype, const char *name); diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc index efe7c2e91b6..7c2e7c003a3 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -1293,7 +1293,8 @@ static void std_node_socket_draw( return; } - if ((sock->in_out == SOCK_OUT) || (sock->flag & SOCK_IS_LINKED) || (sock->flag & SOCK_HIDE_VALUE)) { + if ((sock->in_out == SOCK_OUT) || (sock->flag & SOCK_IS_LINKED) || + (sock->flag & SOCK_HIDE_VALUE)) { node_socket_button_label(C, layout, ptr, node_ptr, text); return; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs