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-05-16 18:14:53 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-05-16 18:45:48 +0300
commitdf963a47fbfcfbcf477e746d18eb0f3bcf1479d9 (patch)
tree4b2f6a42fc80f97dfe6a82bc34e017c149ec2c51
parent5308e31e419cf80b73df2d39e218d95164287ac4 (diff)
Particle edit: Fix disappearing child particles when toggling edit mode
Going to object edit mode and back to particle edit mode used to loose all children from being displayed.
-rw-r--r--source/blender/blenkernel/intern/particle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 2e07616d6a8..dacd826084f 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2822,9 +2822,9 @@ void psys_cache_edit_paths(Depsgraph *depsgraph, Scene *scene, Object *ob, PTCac
ParticleSimulationData sim = {0};
sim.depsgraph = depsgraph;
sim.scene = scene;
- sim.ob = ob;
- sim.psys = psys;
- sim.psmd = psys_get_modifier(ob, psys);
+ sim.ob = ob_eval;
+ sim.psys = psys_eval;
+ sim.psmd = psys_get_modifier(ob_eval, psys_eval);
psys_cache_child_paths(&sim, cfra, true, use_render_params);
}