[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29354] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix [#22538] Crash when Selecting Particle Properties Tab (File-dependant)
Matt Ebb
matt at mke3.net
Wed Jun 9 04:42:27 CEST 2010
Revision: 29354
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29354
Author: broken
Date: 2010-06-09 04:42:20 +0200 (Wed, 09 Jun 2010)
Log Message:
-----------
Fix [#22538] Crash when Selecting Particle Properties Tab (File-dependant)
psys->parent pointer wasn't getting handled in lib_link_particlesystems()
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 2010-06-09 01:17:51 UTC (rev 29353)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-06-09 02:42:20 UTC (rev 29354)
@@ -3074,6 +3074,7 @@
for(; pt; pt=pt->next)
pt->ob=newlibadr(fd, id->lib, pt->ob);
+ psys->parent= newlibadr_us(fd, id->lib, psys->parent);
psys->target_ob = newlibadr(fd, id->lib, psys->target_ob);
if(psys->clmd) {
@@ -3143,7 +3144,7 @@
psys->childcachebufs.first = psys->childcachebufs.last = NULL;
psys->frand = NULL;
psys->pdd = NULL;
-
+
direct_link_pointcache_list(fd, &psys->ptcaches, &psys->pointcache);
if(psys->clmd) {
More information about the Bf-blender-cvs
mailing list