blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

UI: "vertex keys" -> "shape keys" #104868

Closed
Philipp Oeser wants to merge 38 commits from lichtwerk:cleanup_rename_vertex_keys into main
pull from: lichtwerk:cleanup_rename_vertex_keys
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 38 Files Changed 89 +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 e828fd1eb7 - Show all commits

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

@ -78,16 +78,14 @@ bool node_group_poll_instance(const bNode *node,
const bNodeTree *nodetree,
const char **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 */
if (!node->typeinfo->poll(node->typeinfo, nodetree, disabled_hint)) {
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,
@ -116,8 +114,7 @@ bool nodeGroupPoll(const bNodeTree *nodetree,
LISTBASE_FOREACH (const bNode *, node, &grouptree->nodes) {
if (node->typeinfo->poll_instance &&
!node->typeinfo->poll_instance(
const_cast<bNode *>(node), const_cast<bNodeTree *>(nodetree), r_disabled_hint)) {
!node->typeinfo->poll_instance(node, nodetree, r_disabled_hint)) {
return false;
}
}