diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-02 16:16:06 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-02 16:16:06 +0400 |
| commit | 4e8e502c0267faa68ce686df51cfb061d73ae93e (patch) | |
| tree | bf68517c1b537247b52b34d206cc640dc7280b31 /source/blender/blenloader | |
| parent | f5cff8ad37edbb46f155e768a07ff6785938f1b9 (diff) | |
| parent | de0db6c8daaf4f6276b43bd4c78d623fdb0eafb9 (diff) | |
Merging trunk up to r38932.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 18b461eb31d..1737b44a56f 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3163,7 +3163,7 @@ static void lib_link_particlesettings(FileData *fd, Main *main) 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; @@ -3194,6 +3194,9 @@ static void lib_link_particlesettings(FileData *fd, Main *main) 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; |