griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #125069: Texture properties missing

Browse Source 
The Texture Properties tab is missing even if it is used in the
compositor. To fix this, we add a texture space user for texture nodes
in the compositor node tree.

Pull Request: https://projects.blender.org/blender/blender/pulls/125081
This commit is contained in:
Omar Emara
2024-07-22 20:23:50 +02:00
committed by Omar Emara
parent 4e958617a9
commit aca7670569
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/editors/space_buttons/buttons_texture.cc
View File

@@ -111,6 +111,8 @@ static void buttons_texture_user_node_add(ListBase *users,
ID *id,
bNodeTree *ntree,
bNode *node,
PointerRNA ptr,
PropertyRNA *prop,
const char *category,
int icon,
const char *name)
@@ -120,6 +122,8 @@ static void buttons_texture_user_node_add(ListBase *users,
user->id = id;
user->ntree = ntree;
user->node = node;
user->ptr = ptr;
user->prop = prop;
user->category = category;
user->icon = icon;
user->name = name;
@@ -135,13 +139,23 @@ static void buttons_texture_users_find_nodetree(ListBase *users,
{
if (ntree) {
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
if (node->typeinfo->nclass == NODE_CLASS_TEXTURE) {
if (node->type == CMP_NODE_TEXTURE) {
PointerRNA ptr = RNA_pointer_create(&ntree->id, &RNA_Node, node);
// PropertyRNA *prop; /* UNUSED */
// prop = RNA_struct_find_property(&ptr, "texture"); /* UNUSED */
PropertyRNA *prop = RNA_struct_find_property(&ptr, "texture");
buttons_texture_user_node_add(
users, id, ntree, node, category, RNA_struct_ui_icon(ptr.type), node->name);
users, id, ntree, node, ptr, prop, category, RNA_struct_ui_icon(ptr.type), node->name);
}
else if (node->typeinfo->nclass == NODE_CLASS_TEXTURE) {
PointerRNA ptr = RNA_pointer_create(&ntree->id, &RNA_Node, node);
buttons_texture_user_node_add(users,
id,
ntree,
node,
{nullptr},
nullptr,
category,
RNA_struct_ui_icon(ptr.type),
node->name);
}
else if (node->type == NODE_GROUP && node->id) {
buttons_texture_users_find_nodetree(users, id, (bNodeTree *)node->id, category);
@@ -286,6 +300,10 @@ static void buttons_texture_users_from_context(ListBase *users,
/* fill users */
BLI_listbase_clear(users);
if (scene && scene->nodetree) {
buttons_texture_users_find_nodetree(users, &scene->id, scene->nodetree, N_("Compositor"));
}
if (linestyle && !limited_mode) {
buttons_texture_users_find_nodetree(
users, &linestyle->id, linestyle->nodetree, N_("Line Style"));