[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48140] trunk/blender/source/blender/ blenkernel/intern/armature.c: fix for segfault loading a file with a proxy that is a missing link.

Campbell Barton ideasman42 at gmail.com
Wed Jun 20 23:10:35 CEST 2012


Revision: 48140
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48140
Author:   campbellbarton
Date:     2012-06-20 21:10:34 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
fix for segfault loading a file with a proxy that is a missing link.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/armature.c

Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c	2012-06-20 20:07:28 UTC (rev 48139)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c	2012-06-20 21:10:34 UTC (rev 48140)
@@ -1588,7 +1588,11 @@
 	for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
 		pchanp = BKE_pose_channel_find_name(frompose, pchan->name);
 
-		if (pchan->bone->layer & layer_protected) {
+		if (UNLIKELY(pchanp == NULL)) {
+			/* happens for proxies that become invalid because of a missing link
+			 * for regulat cases it shouldn't happen at all */
+		}
+		else if (pchan->bone->layer & layer_protected) {
 			ListBase proxylocal_constraints = {NULL, NULL};
 
 			/* copy posechannel to temp, but restore important pointers */




More information about the Bf-blender-cvs mailing list