Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2020-02-05 13:25:50 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-02-05 17:56:50 +0300
commitc35d6b1854474ec02888f8812041651bdeb5145e (patch)
treef7ce3bb617511b2a84d06e6f2c4b8a9bd3c98368 /source/blender/editors/animation
parent1bc2a98a9d609e54c928672f148edfba9d5f8c5a (diff)
Cleanup: Remove unused function: give_node_material()
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r--source/blender/editors/animation/anim_filter.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index b3a9353bb74..a9ddc53e5bb 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -2290,7 +2290,6 @@ static size_t animdata_filter_ds_material(
static size_t animdata_filter_ds_materials(
bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Object *ob, int filter_mode)
{
- bool has_nested = false;
size_t items = 0;
int a = 0;
@@ -2302,34 +2301,6 @@ static size_t animdata_filter_ds_materials(
if (ma) {
/* add channels */
items += animdata_filter_ds_material(ac, anim_data, ads, ma, filter_mode);
-
- /* for optimising second pass - check if there's a nested material here to come back for */
- if (has_nested == false) {
- has_nested = (give_node_material(ma) != NULL);
- }
- }
- }
-
- /* Second pass: go through a second time looking for "nested" materials
- * (material.material references).
- *
- * NOTE: here we ignore the expanded status of the parent, as it could be too confusing as to
- * why these are disappearing/not available,
- * since the relationships between these is not that clear.
- */
- if (has_nested) {
- for (a = 1; a <= ob->totcol; a++) {
- Material *base = BKE_object_material_get(ob, a);
- Material *ma = give_node_material(base);
-
- /* 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);
- }
}
}