[Bf-blender-cvs] [ea01b24] master: Fix T39623: deleting an object crashes

Campbell Barton noreply at git.blender.org
Mon Apr 7 12:26:19 CEST 2014


Commit: ea01b24bbacbb19019f40f4737d56bb92f04c66d
Author: Campbell Barton
Date:   Mon Apr 7 20:24:20 2014 +1000
https://developer.blender.org/rBea01b24bbacbb19019f40f4737d56bb92f04c66d

Fix T39623: deleting an object crashes

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

M	source/blender/blenkernel/intern/anim_sys.c

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

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 7bd5e22..8692ff2 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -894,7 +894,7 @@ void BKE_animdata_main_cb(Main *mainptr, ID_AnimData_Edit_Callback func, void *u
 		AnimData *adt = BKE_animdata_from_id(id); \
 		NtId_Type *ntp = (NtId_Type *)id; \
 		if (ntp->nodetree) { \
-			AnimData *adt2 = BKE_animdata_from_id((ID *)ntp); \
+			AnimData *adt2 = BKE_animdata_from_id((ID *)ntp->nodetree); \
 			if (adt2) func(id, adt2, user_data); \
 		} \
 		if (adt) func(id, adt, user_data); \




More information about the Bf-blender-cvs mailing list