[Bf-blender-cvs] [9b74e648c51] master: Fix T71495: Some Textures with AnimData not visible in Dopesheet
Sybren A. Stüvel
noreply at git.blender.org
Fri Jan 3 11:26:43 CET 2020
Commit: 9b74e648c512f18d81cce9ba2ceb62d4f8a8dd91
Author: Sybren A. Stüvel
Date: Thu Jan 2 17:44:00 2020 +0100
Branches: master
https://developer.blender.org/rB9b74e648c512f18d81cce9ba2ceb62d4f8a8dd91
Fix T71495: Some Textures with AnimData not visible in Dopesheet
T71495 describes two problems with animation of textures not showing up in
the dope sheet:
1. textures connected to force fields
2. textures of brushes
This patch resolves the first case.
An alternative would be to switch to iteration of dependencies using
`BKE_library_foreach_ID_link()`. This is a good idea to do at some point,
but adding these few lines was considerably easier & safer to do.
===================================================================
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 dd1f2758d58..4c81df8b71d 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -56,6 +56,7 @@
#include "DNA_meta_types.h"
#include "DNA_movieclip_types.h"
#include "DNA_node_types.h"
+#include "DNA_object_force_types.h"
#include "DNA_particle_types.h"
#include "DNA_space_types.h"
#include "DNA_sequence_types.h"
@@ -2733,6 +2734,12 @@ static size_t animdata_filter_dopesheet_ob(
tmp_items += animdata_filter_ds_obanim(ac, &tmp_data, ads, ob, filter_mode);
}
+ /* particle deflector textures */
+ if (ob->pd != NULL && ob->pd->tex != NULL && !(ads->filterflag & ADS_FILTER_NOTEX)) {
+ tmp_items += animdata_filter_ds_texture(
+ ac, &tmp_data, ads, ob->pd->tex, &ob->id, filter_mode);
+ }
+
/* shape-key */
if ((key && key->adt) && !(ads->filterflag & ADS_FILTER_NOSHAPEKEYS)) {
tmp_items += animdata_filter_ds_keyanim(ac, &tmp_data, ads, ob, key, filter_mode);
More information about the Bf-blender-cvs
mailing list