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:
authorSybren A. Stüvel <sybren@blender.org>2020-01-02 19:44:00 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-01-03 13:02:35 +0300
commit9b74e648c512f18d81cce9ba2ceb62d4f8a8dd91 (patch)
treea90117dde296e0f1970ea3f0d848d75f6dc5e14f /source/blender/editors/animation
parent846c034323784ac938249b08ad622753d4f3dd34 (diff)
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.
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r--source/blender/editors/animation/anim_filter.c7
1 files changed, 7 insertions, 0 deletions
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);