Commit: 9befee49a764fc8c96b3d7a71a62d5998d231c8a
Author: Joshua Leung
Date: Wed Apr 25 11:18:35 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9befee49a764fc8c96b3d7a71a62d5998d231c8a
Fix: Silence texture stack owner_id warnings in debug mode from anim_filtering
code
The Blender Internal removal (51b796ff1528c52cc8b4079fab1003671652a4d9)
removed support for texture slots from Materials/Lamps/Worlds,
but didn't remove the relevant parts from the animation editor filtering
code that were responsible for adding the texture slots for those channels.
===================================================================
M source/blender/editors/animation/anim_filter.c
===================================================================
diff --git a/source/blender/editors/animation/anim_filter.c
b/source/blender/editors/animation/anim_filter.c
index dec41248053..b7eaa1a4a5f 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -2061,7 +2061,9 @@ static size_t animdata_filter_ds_texture(bAnimContext
*ac, ListBase *anim_data,
return items;
}
-/* NOTE: owner_id is either material, lamp, or world block, which is the
direct owner of the texture stack in question */
+/* NOTE: owner_id is the direct owner of the texture stack in question
+ * It used to be Material/Lamp/World before the Blender Internal removal
for 2.8
+ */
static size_t animdata_filter_ds_textures(bAnimContext *ac, ListBase
*anim_data, bDopeSheet *ads, ID *owner_id, int filter_mode)
{
MTex **mtex = NULL;
@@ -2117,10 +2119,6 @@ static size_t animdata_filter_ds_material(bAnimContext
*ac, ListBase *anim_data,
/* material's animation data */
tmp_items += animfilter_block_data(ac, &tmp_data, ads, (ID
*)ma, filter_mode);
- /* textures */
- if (!(ads->filterflag & ADS_FILTER_NOTEX))
- tmp_items += animdata_filter_ds_textures(ac, &tmp_data,
ads, (ID *)ma, filter_mode);
-
/* nodes */
if ((ma->nodetree) && !(ads->filterflag & ADS_FILTER_NONTREE))
tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data,
ads, (ID *)ma, ma->nodetree, filter_mode);
@@ -2439,10 +2437,6 @@ static size_t animdata_filter_ds_obdata(bAnimContext
*ac, ListBase *anim_data, b
/* nodetree */
if ((ntree) && !(ads->filterflag &
ADS_FILTER_NONTREE))
tmp_items +=
animdata_filter_ds_nodetree(ac, &tmp_data, ads, &la->id, ntree, filter_mode);
-
- /* textures */
- if (!(ads->filterflag & ADS_FILTER_NOTEX))
- tmp_items +=
animdata_filter_ds_textures(ac, &tmp_data, ads, &la->id, filter_mode);
break;
}
}
@@ -2647,10 +2641,6 @@ static size_t animdata_filter_ds_world(bAnimContext *ac,
ListBase *anim_data, bD
/* animation data filtering */
tmp_items += animfilter_block_data(ac, &tmp_data, ads, (ID
*)wo, filter_mode);
- /* textures for world */
- if (!(ads->filterflag & ADS_FILTER_NOTEX))
- tmp_items += animdata_filter_ds_textures(ac, &tmp_data,
ads, (ID *)wo, filter_mode);
-
/* nodes */
if ((wo->nodetree) && !(ads->filterflag & ADS_FILTER_NONTREE))
tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data,
ads, (ID *)wo, wo->nodetree, filter_mode);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
