diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-05-12 16:08:03 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-05-12 16:08:03 +0300 |
| commit | 1b289029bb543853ea8e6aa1b0eb35eab6e84440 (patch) | |
| tree | 4d1c394185fee39ec64e893dbe50dd3c4199f16f /source/blender/editors | |
| parent | f7715b33374ae6be20fcc0b1db789c1b8451ead0 (diff) | |
| parent | 94cbfb71bcf4f0499301f7c6f201124d8740cacf (diff) | |
Merge remote-tracking branch 'origin/blender-v2.83-release'
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/screen/screen_context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 2ac113d2ba7..b383930ddda 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -514,6 +514,9 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult ANIM_animdata_filter(&ac, &anim_data, ANIMFILTER_DATA_VISIBLE, ac.data, ac.datatype); for (ale = anim_data.first; ale; ale = ale->next) { + if (ale->datatype != ALE_NLASTRIP) { + continue; + } NlaTrack *nlt = (NlaTrack *)ale->data; NlaStrip *strip; for (strip = nlt->strips.first; strip; strip = strip->next) { |