[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47214] trunk/blender/source/blender/ blenloader/intern/readfile.c: workaround for crash when rig library links dont load.

Campbell Barton ideasman42 at gmail.com
Wed May 30 11:27:17 CEST 2012


Revision: 47214
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47214
Author:   campbellbarton
Date:     2012-05-30 09:27:16 +0000 (Wed, 30 May 2012)
Log Message:
-----------
workaround for crash when rig library links dont load. - will leak memory but better then crash.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-05-30 09:15:02 UTC (rev 47213)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-05-30 09:27:16 UTC (rev 47214)
@@ -4051,7 +4051,16 @@
 				warn = 1;
 				
 				if (ob->pose) {
+					/* we can't call #BKE_pose_free() here because of library linking
+					 * freeing will recurse down into every pose constraints ID pointers
+					 * which are not always valid, so for now free directly and suffer
+					 * some leaked memory rather then crashing immediately
+					 * while bad this _is_ an exceptional case - campbell */
+#if 0
 					BKE_pose_free(ob->pose);
+#else
+					MEM_freeN(ob->pose);
+#endif
 					ob->pose= NULL;
 					ob->mode &= ~OB_MODE_POSE;
 				}




More information about the Bf-blender-cvs mailing list