[Bf-blender-cvs] [f808f2a4950] master: Fix T81214: Crash on Action constraint without action
Sybren A. Stüvel
noreply at git.blender.org
Mon Sep 28 11:23:49 CEST 2020
Commit: f808f2a4950a99f74780ea87e9d62ee36bc4ff35
Author: Sybren A. Stüvel
Date: Mon Sep 28 11:23:34 2020 +0200
Branches: master
https://developer.blender.org/rBf808f2a4950a99f74780ea87e9d62ee36bc4ff35
Fix T81214: Crash on Action constraint without action
A `NULL` pointer check was missing.
===================================================================
M source/blender/blenkernel/intern/anim_data.c
===================================================================
diff --git a/source/blender/blenkernel/intern/anim_data.c b/source/blender/blenkernel/intern/anim_data.c
index eb2cdf585c4..e7c6e00a61f 100644
--- a/source/blender/blenkernel/intern/anim_data.c
+++ b/source/blender/blenkernel/intern/anim_data.c
@@ -239,6 +239,11 @@ bool BKE_animdata_action_ensure_idroot(const ID *owner, bAction *action)
{
const int idcode = GS(owner->name);
+ if (action == NULL) {
+ /* A NULL action is usable by any ID type. */
+ return true;
+ }
+
if (action->idroot == 0) {
/* First time this Action is assigned, lock it to this ID type. */
action->idroot = idcode;
More information about the Bf-blender-cvs
mailing list