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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-11-12 18:24:53 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-11-13 13:39:02 +0300
commit34058c4ff1684b4d2e4d8619e2a7b690d9286140 (patch)
tree9fbfd91cbc8a8f9719b4a677e7b36df75e01ead2 /source/blender/blenkernel/intern/particle_system.c
parent647a79807600f8ad3159935d1f985fe7a1ede5fc (diff)
Fix T57105: Baked Particles could not be rendered as expected
Same fix as for smoke (and is what caching proposal is AFAIK): share cache between copied and original objects. One thing which is still missing to be fixed is to make auto-cache more reliable. It was already kind of broken, so don't think it should be a stopping factor for this fix.
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index c363d9f29c2..39298130130 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4386,7 +4386,7 @@ void particle_system_update(struct Depsgraph *depsgraph, Scene *scene, Object *o
psys_orig->edit->psys_eval = psys;
psys_orig->edit->psmd_eval = psmd;
}
- psys_orig->flag = psys->flag;
+ psys_orig->flag = (psys->flag & ~PSYS_SHARED_CACHES);
}
}