Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +8 -11
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f0c48710e - Show all commits

19
source/blender/nodes/intern/node_common.cc
View File

@ -78,17 +78,15 @@ bool node_group_poll_instance(const bNode *node,
const bNodeTree *nodetree, const bNodeTree *nodetree,
const char **disabled_hint) const char **disabled_hint)
{ {
if (node->typeinfo->poll(node->typeinfo, nodetree, disabled_hint)) { if (!node->typeinfo->poll(node->typeinfo, nodetree, disabled_hint)) {
const bNodeTree *grouptree = (const bNodeTree *)node->id;
if (grouptree) {
return nodeGroupPoll(nodetree, grouptree, disabled_hint);
}
return true; /* without a linked node tree, group node is always ok */
}
return false; return false;
} }
const bNodeTree *grouptree = reinterpret_cast<const bNodeTree *>(node->id);
if (!grouptree) {
return true;
}
return nodeGroupPoll(nodetree, grouptree, disabled_hint);
}
bool nodeGroupPoll(const bNodeTree *nodetree, bool nodeGroupPoll(const bNodeTree *nodetree,
const bNodeTree *grouptree, const bNodeTree *grouptree,
@ -116,8 +114,7 @@ bool nodeGroupPoll(const bNodeTree *nodetree,
LISTBASE_FOREACH (const bNode *, node, &grouptree->nodes) { LISTBASE_FOREACH (const bNode *, node, &grouptree->nodes) {
if (node->typeinfo->poll_instance && if (node->typeinfo->poll_instance &&
!node->typeinfo->poll_instance( !node->typeinfo->poll_instance(node, nodetree, r_disabled_hint)) {
const_cast<bNode *>(node), const_cast<bNodeTree *>(nodetree), r_disabled_hint)) {
return false; return false;
} }
} }