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

Cleanup: Use LISTBASE_FOREACH macro

Browse Source
This commit is contained in:
Hans Goudey
2021-12-03 16:33:14 -05:00
parent 2d8606b360
commit 56ed4c14d3
1 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/blender/editors/space_node/node_select.cc
View File

@@ -102,9 +102,7 @@ static bool has_workbench_in_texture_color(const wmWindowManager *wm,
static bNode *node_under_mouse_select(bNodeTree &ntree, int mx, int my) static bNode *node_under_mouse_select(bNodeTree &ntree, int mx, int my)
{ {
bNode *node; LISTBASE_FOREACH_BACKWARD (bNode *, node, &ntree.nodes) {
for (node = (bNode *)ntree.nodes.last; node; node = node->prev) {
if (node->typeinfo->select_area_func) { if (node->typeinfo->select_area_func) {
if (node->typeinfo->select_area_func(node, mx, my)) { if (node->typeinfo->select_area_func(node, mx, my)) {
return node; return node;
@@ -116,9 +114,7 @@ static bNode *node_under_mouse_select(bNodeTree &ntree, int mx, int my)
static bNode *node_under_mouse_tweak(bNodeTree &ntree, const float2 &mouse) static bNode *node_under_mouse_tweak(bNodeTree &ntree, const float2 &mouse)
{ {
bNode *node; LISTBASE_FOREACH_BACKWARD (bNode *, node, &ntree.nodes) {
for (node = (bNode *)ntree.nodes.last; node; node = node->prev) {
if (node->typeinfo->tweak_area_func) { if (node->typeinfo->tweak_area_func) {
if (node->typeinfo->tweak_area_func(node, (int)mouse.x, (int)mouse.y)) { if (node->typeinfo->tweak_area_func(node, (int)mouse.x, (int)mouse.y)) {
return node; return node;
@@ -214,26 +210,23 @@ void node_deselect_all(SpaceNode &snode)
void node_deselect_all_input_sockets(SpaceNode &snode, const bool deselect_nodes) void node_deselect_all_input_sockets(SpaceNode &snode, const bool deselect_nodes)
{ {
bNode *node;
bNodeSocket *sock;
/* XXX not calling node_socket_deselect here each time, because this does iteration /* XXX not calling node_socket_deselect here each time, because this does iteration
* over all node sockets internally to check if the node stays selected. * over all node sockets internally to check if the node stays selected.
* We can do that more efficiently here. * We can do that more efficiently here.
*/ */
for (node = (bNode *)snode.edittree->nodes.first; node; node = node->next) { LISTBASE_FOREACH (bNode *, node, &snode.edittree->nodes) {
int sel = 0; bool sel = false;
for (sock = (bNodeSocket *)node->inputs.first; sock; sock = sock->next) { LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
sock->flag &= ~SELECT; socket->flag &= ~SELECT;
} }
/* if no selected sockets remain, also deselect the node */ /* if no selected sockets remain, also deselect the node */
if (deselect_nodes) { if (deselect_nodes) {
for (sock = (bNodeSocket *)node->outputs.first; sock; sock = sock->next) { LISTBASE_FOREACH (bNodeSocket *, socket, &node->outputs) {
if (sock->flag & SELECT) { if (socket->flag & SELECT) {
sel = 1; sel = true;
break; break;
} }
} }
@@ -247,25 +240,22 @@ void node_deselect_all_input_sockets(SpaceNode &snode, const bool deselect_nodes
void node_deselect_all_output_sockets(SpaceNode &snode, const bool deselect_nodes) void node_deselect_all_output_sockets(SpaceNode &snode, const bool deselect_nodes)
{ {
bNode *node;
bNodeSocket *sock;
/* XXX not calling node_socket_deselect here each time, because this does iteration /* XXX not calling node_socket_deselect here each time, because this does iteration
* over all node sockets internally to check if the node stays selected. * over all node sockets internally to check if the node stays selected.
* We can do that more efficiently here. * We can do that more efficiently here.
*/ */
for (node = (bNode *)snode.edittree->nodes.first; node; node = node->next) { LISTBASE_FOREACH (bNode *, node, &snode.edittree->nodes) {
bool sel = false; bool sel = false;
for (sock = (bNodeSocket *)node->outputs.first; sock; sock = sock->next) { LISTBASE_FOREACH (bNodeSocket *, socket, &node->outputs) {
sock->flag &= ~SELECT; socket->flag &= ~SELECT;
} }
/* if no selected sockets remain, also deselect the node */ /* if no selected sockets remain, also deselect the node */
if (deselect_nodes) { if (deselect_nodes) {
for (sock = (bNodeSocket *)node->inputs.first; sock; sock = sock->next) { LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
if (sock->flag & SELECT) { if (socket->flag & SELECT) {
sel = true; sel = true;
break; break;
} }
@@ -305,10 +295,9 @@ static bool node_select_grouped_type(SpaceNode *snode, bNode *node_act)
static bool node_select_grouped_color(SpaceNode *snode, bNode *node_act) static bool node_select_grouped_color(SpaceNode *snode, bNode *node_act)
{ {
bNode *node;
bool changed = false; bool changed = false;
for (node = (bNode *)snode->edittree->nodes.first; node; node = node->next) { LISTBASE_FOREACH (bNode *, node, &snode->edittree->nodes) {
if ((node->flag & SELECT) == 0) { if ((node->flag & SELECT) == 0) {
if (compare_v3v3(node->color, node_act->color, 0.005f)) { if (compare_v3v3(node->color, node_act->color, 0.005f)) {
nodeSetSelected(node, true); nodeSetSelected(node, true);