blender
/
blender
130
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix T39018: Duplicate entries for material/shader in AnimEditors 

In many BI shader setups, the material which owns the nodetree is often itself
included as a node in that nodetree (i.e. to provide the base colour for that
mesh). This would often result in the material (and its subtree) getting included
in the dopesheet results twice.
This commit is contained in:
Joshua Leung 2014-03-09 19:23:32 +13:00
parent fa24ad1fd5
commit d219312d44
Notes: blender-bot 2023-02-14 11:03:48 +01:00 
Referenced by issue #39018, Node dirver bug in Material and Texture
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/animation/anim_filter.c
View File

@ -1796,9 +1796,14 @@ static size_t animdata_filter_ds_materials(bAnimContext *ac, ListBase *anim_data
Material *base = give_current_material(ob, a);
Material *ma = give_node_material(base);
/* add channels from the nested material if it exists */
if (ma)
/* add channels from the nested material if it exists
* - skip if the same material is referenced in its node tree
* (which is common for BI materials) as that results in
* confusing duplicates
*/
if ((ma) && (ma != base)) {
items += animdata_filter_ds_material(ac, anim_data, ads, ma, filter_mode);
}
}
}