blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

RNA nodetree: improve ImageUser path helper. 

Refactor the code, and optimize it slightly (no need e.g. to check for
nodes when the nodetree is of a type that cannot have image user nodes).
This commit is contained in:
Bastien Montagne 2022-06-08 17:47:45 +02:00
parent 1a71f9d2b8
commit d62e6f1225
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -1610,26 +1610,31 @@ static char *rna_Node_path(const PointerRNA *ptr)
char *rna_Node_ImageUser_path(const PointerRNA *ptr)
{
bNodeTree *ntree = (bNodeTree *)ptr->owner_id;
bNode *node;
char name_esc[sizeof(node->name) * 2];
if (!ELEM(ntree->type, NTREE_SHADER, NTREE_CUSTOM)) {
return NULL;
}
for (node = ntree->nodes.first; node; node = node->next) {
if (node->type == SH_NODE_TEX_ENVIRONMENT) {
NodeTexEnvironment *data = node->storage;
if (&data->iuser != ptr->data) {
continue;
for (bNode *node = ntree->nodes.first; node; node = node->next) {
switch (node->type) {
case SH_NODE_TEX_ENVIRONMENT: {
NodeTexEnvironment *data = node->storage;
if (&data->iuser != ptr->data) {
continue;
}
break;
}
}
else if (node->type == SH_NODE_TEX_IMAGE) {
NodeTexImage *data = node->storage;
if (&data->iuser != ptr->data) {
continue;
case SH_NODE_TEX_IMAGE: {
NodeTexImage *data = node->storage;
if (&data->iuser != ptr->data) {
continue;
}
break;
}
}
else {
continue;
default:
continue;
}
char name_esc[sizeof(node->name) * 2];
BLI_str_escape(name_esc, node->name, sizeof(name_esc));
return BLI_sprintfN("nodes[\"%s\"].image_user", name_esc);
}