[Bf-blender-cvs] [e5bb02aaa41] blender-v2.83-release: Fix T76669: Crash when doing right click on channel

Jacques Lucke noreply at git.blender.org
Tue May 12 14:48:15 CEST 2020


Commit: e5bb02aaa41615d9f48376e53e5cf7569e1bc1d2
Author: Jacques Lucke
Date:   Tue May 12 14:47:21 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBe5bb02aaa41615d9f48376e53e5cf7569e1bc1d2

Fix T76669: Crash when doing right click on channel

Reviewers: lichtwerk, sybren

Differential Revision: https://developer.blender.org/D7702

===================================================================

M	source/blender/editors/screen/screen_context.c

===================================================================

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) {



More information about the Bf-blender-cvs mailing list