[Bf-blender-cvs] [913b6b9ec1b] master: Fix T96624: NLA crash when reordering tracks if no object is selected.

Pratik Borhade noreply at git.blender.org
Tue Mar 22 12:05:32 CET 2022


Commit: 913b6b9ec1b1f3cf83b21956b06e2f6d3341c78c
Author: Pratik Borhade
Date:   Tue Mar 22 12:03:53 2022 +0100
Branches: master
https://developer.blender.org/rB913b6b9ec1b1f3cf83b21956b06e2f6d3341c78c

Fix T96624: NLA crash when reordering tracks if no object is selected.

Caused by rBc0bd240ad0a1.
To avoid crash, make boolean value false if active object data is NULL.

Should be backported to 2.93 LTS and 3.1 corrective releases.

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

M	source/blender/editors/animation/anim_channels_edit.c

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

diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index df418b204f9..08379be36fa 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -1131,7 +1131,7 @@ static void rearrange_nla_channels(bAnimContext *ac, AnimData *adt, eRearrangeAn
 {
   AnimChanRearrangeFp rearrange_func;
   ListBase anim_data_visible = {NULL, NULL};
-  const bool is_liboverride = ID_IS_OVERRIDE_LIBRARY(ac->obact);
+  const bool is_liboverride = (ac->obact != NULL) ? ID_IS_OVERRIDE_LIBRARY(ac->obact) : false;
 
   /* hack: invert mode so that functions will work in right order */
   mode *= -1;



More information about the Bf-blender-cvs mailing list