diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-07-15 17:32:02 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-07-15 17:32:02 +0400 |
| commit | 729498ab2da989d0bfbba02c1b1a6bc9f6964b1c (patch) | |
| tree | d2d7e6ddcd8709efc6b0f65993d0d980169adacb /source/blender/makesdna | |
| parent | 7984e338db93c7d5d276f1cb8a6a468ccd4446a7 (diff) | |
Fix for [#26712] Particle group instance 'Use Count' value gets reset on file-load.
* New object pointers can't be loaded properly for library linked groups, so the weight groups now store an index to the group objects at save time. This index is used at load time to set the objects without relying on the old pointers.
* If the library linked group is modified the indices can be wrong, but this can't really be avoided easily as there's no way to relate objects in a linked group between loads.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index aace8156e9d..69ee530c0b6 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -89,7 +89,8 @@ typedef struct ParticleDupliWeight { struct ParticleDupliWeight *next, *prev; struct Object *ob; short count; - short flag, rt[2]; + short flag; + short index, rt; /* only updated on file save and used on file load */ } ParticleDupliWeight; typedef struct ParticleData { |