[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38883] trunk/blender/source/blender/ blenloader/intern/readfile.c: Bug fix: loading a file that had particles using a dupligroup from a liblinked file without the library file being present crashed
Janne Karhu
jhkarh at gmail.com
Sun Jul 31 18:26:02 CEST 2011
Revision: 38883
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38883
Author: jhk
Date: 2011-07-31 16:26:02 +0000 (Sun, 31 Jul 2011)
Log Message:
-----------
Bug fix: loading a file that had particles using a dupligroup from a liblinked file without the library file being present crashed
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 2011-07-31 12:46:34 UTC (rev 38882)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-07-31 16:26:02 UTC (rev 38883)
@@ -3162,7 +3162,7 @@
if(part->effector_weights)
part->effector_weights->group = newlibadr(fd, part->id.lib, part->effector_weights->group);
- if(part->dupliweights.first) {
+ if(part->dupliweights.first && part->dup_group) {
int index_ok = 0;
/* check for old files without indices (all indexes 0) */
dw = part->dupliweights.first;
@@ -3193,6 +3193,9 @@
dw->ob = newlibadr(fd, part->id.lib, dw->ob);
}
}
+ else {
+ part->dupliweights.first = part->dupliweights.last = NULL;
+ }
if(part->boids) {
BoidState *state = part->boids->states.first;
More information about the Bf-blender-cvs
mailing list