Details

Reviewers

Sergey Sharybin (sergey)
Antonis Ryakiotakis (psy-fi)
Sebastian Parborg (zeddb)
Brecht Van Lommel (brecht)

Maniphest Tasks

T67597: Texture painting: Texture slots that correspond to nodes inside node_groups don't remain active

Commits

rBbc42092a7ddb: Fix T67597: Texture painting: Texture slots that correspond to nodes inside…

Summary

Apparently, ma->paint_active_slot is always in sync with the current active texture node in nodetree.
So for the value set in ma->paint_active_slot to remain unchanged, the texture node it represents in nodetree must also become active.
To this, rna_Material_active_paint_texture_index_update searchs the node corresponding to ma->paint_active_slot and activates it.
The problem was that rna_Material_active_paint_texture_index_update did not search for texture nodes that are inside node groups (unlike fill_texpaint_slots_recursive).

The solution was to do a recursive function similar to fill_texpaint_slots_recursive and not ignore nodes inside groups.

Ref T67597

Related commits: rBf745564e, rB86aa621

Diff Detail

Repository

rB Blender

Branch

arcpatch-D5338 (branched from master)

Build Status

Buildable 4151
Build 4151: arc lint + arc unit

Event Timeline

Germano Cavalcante (mano-wii) created this revision.Jul 25 2019, 12:16 AM

Harbormaster completed remote builds in B4148: Diff 16585.Jul 25 2019, 12:16 AM

Sergey Sharybin (sergey) added inline comments.Jul 25 2019, 9:06 AM

source/blender/blenkernel/intern/material.c
1124	Instead of requesting to keep two function in sync, is it possible to make function itself more generic and public and re-use for this two cases?

Deduplicate code using a generic recursive function

Harbormaster completed remote builds in B4151: Diff 16589.Jul 25 2019, 1:36 PM

Cleanup and warnings

Harbormaster completed remote builds in B4157: Diff 16596.Jul 25 2019, 7:02 PM

This problem was probably introduced in rB86aa621f4b27.
So adding @Brecht Van Lommel (brecht) as reviewer too.

Fine generally, just minor comments.

source/blender/blenkernel/BKE_material.h
98	Since this is the inverse of `BKE_object_material_slot_find_index`, they should be next to each other and the naming should be consistent: `find_index` and `find_node`.
source/blender/makesrna/intern/rna_material.c
150–151	rna_material.c:150:9: warning: unused variable 'index'

This revision now requires changes to proceed.Jul 31 2019, 12:18 PM

Rename node_find to find_node
rna_material.c:150:9: warning: unused variable 'index'

Harbormaster completed remote builds in B4232: Diff 16722.Jul 31 2019, 3:47 PM

Germano Cavalcante (mano-wii) added inline comments.Jul 31 2019, 3:47 PM

source/blender/blenkernel/BKE_material.h
98	`BKE_object_material_slot_find_index` is not the inverse of` BKE_texpaint_slot_material_node_find`. Currently most similar to her inverse would be `fill_texpaint_slots_recursive`. But I renamed it anyway.

Brecht Van Lommel (brecht) accepted this revision.Jul 31 2019, 4:00 PM

This revision is now accepted and ready to land.Jul 31 2019, 4:00 PM

Closed by commit rBbc42092a7ddb: Fix T67597: Texture painting: Texture slots that correspond to nodes inside… (authored by Germano Cavalcante (mano-wii)). · Explain WhyJul 31 2019, 4:40 PM

This revision was automatically updated to reflect the committed changes.

Germano Cavalcante (mano-wii) added a commit: rBbc42092a7ddb: Fix T67597: Texture painting: Texture slots that correspond to nodes inside….

Fix T67597: Texture painting: Texture slots that correspond to nodes inside node_groups don't remain active
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 16589

source/blender/blenkernel/BKE_material.h

source/blender/blenkernel/intern/material.c

source/blender/makesrna/intern/rna_material.c

Fix T67597: Texture painting: Texture slots that correspond to nodes inside node_groups don't remain activeClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 16589

source/blender/blenkernel/BKE_material.h

source/blender/blenkernel/intern/material.c

source/blender/makesrna/intern/rna_material.c

Fix T67597: Texture painting: Texture slots that correspond to nodes inside node_groups don't remain active
ClosedPublic
Actions

Revision Contents
Changeset List