[Bf-blender-cvs] [69cea4fce15] blender-v2.93-release: Fix T96624: NLA crash when reordering tracks if no object is selected.

Pratik Borhade noreply at git.blender.org
Thu Mar 24 10:52:48 CET 2022


Commit: 69cea4fce15fa4542b62a21d26987e14bd733744
Author: Pratik Borhade
Date:   Tue Mar 22 12:03:53 2022 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rB69cea4fce15fa4542b62a21d26987e14bd733744

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 e1d0ed833bf..1b27b27593d 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -1160,7 +1160,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