Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2016-10-08 20:13:50 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-10-08 20:13:50 +0300
commitc2758706732871166eef845ce017b2f0c7b1fddf (patch)
tree8492453dfb28e84d9e81144ec84532ed9c9ae6ba /source/blender/blenloader
parent00dc0666b3fedfbb24aef0e636a3227746e465f2 (diff)
Ammend to rB00dc0666b3fe: forgot to fix boid->ground of first particle.
This code is confusing, such dirty details should not sneak out of particles' own private code. :(
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e3b06b07222..c1da78d3877 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4281,9 +4281,10 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles)
if (psys->particles && psys->particles->boid) {
pa = psys->particles;
pa->boid = newdataadr(fd, pa->boid);
+ pa->boid->ground = NULL; /* This is purely runtime data, but still can be an issue if left dangling. */
for (a = 1, pa++; a < psys->totpart; a++, pa++) {
pa->boid = (pa - 1)->boid + 1;
- pa->boid->ground = NULL; /* This is purely runtime data, but still can be an issue if left dangling. */
+ pa->boid->ground = NULL;
}
}
else if (psys->particles) {