diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-21 02:41:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-21 02:44:35 +0300 |
| commit | 1c199401983bd53577cb180efe83ee5314f04296 (patch) | |
| tree | 2e7262bdbc0f80650d3cb850f4d723e516e8a884 /source/blender | |
| parent | 29ce3dfeb6a8b0e85c477e7b917b50a6eaca8024 (diff) | |
Fix T48688: Crash loading particle effector weights
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b11f3093850..838179ec0a9 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4054,9 +4054,13 @@ static void lib_link_particlesettings(FileData *fd, Main *main) lib_link_partdeflect(fd, &part->id, part->pd); lib_link_partdeflect(fd, &part->id, part->pd2); - if (part->effector_weights) + if (part->effector_weights) { part->effector_weights->group = newlibadr(fd, part->id.lib, part->effector_weights->group); - + } + else { + part->effector_weights = BKE_add_effector_weights(part->eff_group); + } + if (part->dupliweights.first && part->dup_group) { int index_ok = 0; /* check for old files without indices (all indexes 0) */ |