[Bf-blender-cvs] [aa7ccbf] fracture_modifier: crash fix: deleting fracture modifier helper objects left group objects with go->ob == NULL, which caused crashes in depgraph update, now also deleting group objects with go->ob == NULL

Martin Felke noreply at git.blender.org
Sun Oct 19 13:33:17 CEST 2014


Commit: aa7ccbff3557fc88501c682143bc7f08fd9f78ca
Author: Martin Felke
Date:   Sun Oct 19 13:28:34 2014 +0200
Branches: fracture_modifier
https://developer.blender.org/rBaa7ccbff3557fc88501c682143bc7f08fd9f78ca

crash fix: deleting fracture modifier helper objects left group objects with go->ob == NULL, which caused crashes in depgraph update, now also deleting group objects with go->ob == NULL

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

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

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

diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index 6ea6baf..147e8a1 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -204,7 +204,9 @@ static int group_object_unlink_internal(Group *group, Object *ob)
 	go = group->gobject.first;
 	while (go) {
 		gon = go->next;
-		if (go->ob == ob) {
+		/* case go->ob == NULL occurs in Fracture Modifier helper object group, should be checked for here or will crash
+		 * in following depgraph update */
+		if (go->ob == ob || go->ob == NULL) {
 			BLI_remlink(&group->gobject, go);
 			free_group_object(go);
 			removed = 1;




More information about the Bf-blender-cvs mailing list