blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 769 Projects 19 Wiki Activity

Cleanup: Reduce nesteds in node.cc #105509

Merged
Hans Goudey merged 12 commits from mod_moder/blender:cleanup_reduce_nesteds into main 2023-04-16 22:53:20 +02:00
Conversation 1 Commits 12 Files Changed 1 +14 -25
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b72c7ce7b6 - Show all commits

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

@ -1407,21 +1407,20 @@ bool nodeTypeUndefined(const bNode *node)
return true;
}
if (!node->is_group()) {
return false;
if (node->is_group()) {
mod_moder marked this conversation as resolved Outdated
Hans Goudey commented 2023-03-08 21:42:38 +01:00
Outdated
Review
Copy Link

Better to keep all of the checks that are only relevant to a group node in one block:

if (node->is_group()) {
  if (group_invalid_1) {
    return false;
  }
  if (group_invalid_2) {
    return false;
  }
}

if (some other invalid check in the future) {
  return false;
}

return true;
Better to keep all of the checks that are only relevant to a group node in one block: ```cpp if (node->is_group()) { if (group_invalid_1) { return false; } if (group_invalid_2) { return false; } } if (some other invalid check in the future) { return false; } return true;
const ID *group_tree = node->id;
if (group_tree == nullptr) {
return false;
}
if (!ID_IS_LINKED(group_tree)) {
return false;
}
if ((group_tree->tag & LIB_TAG_MISSING) == 0) {
return false;
}
return true;
}
const ID *group_tree = node->id;
if (group_tree == nullptr) {
return false;
}
if (!ID_IS_LINKED(group_tree)) {
return false;
}
if ((group_tree->tag & LIB_TAG_MISSING) == 0) {
return false;
}
return true;
return false;
}
GHashIterator *nodeTypeGetIterator()
@ -2103,12 +2102,6 @@ void nodeChainIter(const bNodeTree *ntree,
/* Skip links marked as cyclic. */
continue;
}
/* TODO (mod_moder): This case less likely than the case below. Very less likely. Can swap.
* Need a benchmark.*/
if (ELEM(nullptr, link->tonode, link->fromnode)) {
continue;
}
/* Is the link part of the chain meaning node_start == fromnode
* (or tonode for reversed case)? */
if (!reversed) {
@ -2274,13 +2267,9 @@ bNode *nodeAddStaticNode(const bContext *C, bNodeTree *ntree, const int type)
if (ntype->type != type) {
continue;
}
if (ntype->poll == nullptr) {
continue;
}
const char *disabled_hint;
const bool can_by_created = ntype->poll(ntype, ntree, &disabled_hint);
if (can_by_created) {
if (ntype->poll && ntype->poll(ntype, ntree, &disabled_hint)) {
idname = ntype->idname;
break;
}