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-15 15:50:24 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-05-15 18:20:02 +0300
commit2d0efe2e7863c5ebc5e88b2ae17cd20cb3c7e8e6 (patch)
tree0b67d1166a52b5857bbe07fc6fc2bf7d0502d8a8 /source/blender/editors/physics
parenta104c41759613899e314c328e48d6b16cd634d1a (diff)
Particle edit: Need to check DONE flag from evaluated psys
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r--source/blender/editors/physics/particle_edit.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 79afba38d08..7f8f08beaac 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -257,8 +257,12 @@ static PTCacheEdit *pe_get_current(
edit = pid->cache->edit;
}
else {
- if (create && !psys->edit && psys->flag & PSYS_HAIR_DONE)
- PE_create_particle_edit(depsgraph, scene, ob, NULL, psys);
+ if (create && !psys->edit) {
+ ParticleSystem *psys_eval = psys_eval_get(depsgraph, ob, psys);
+ if (psys_eval->flag & PSYS_HAIR_DONE) {
+ PE_create_particle_edit(depsgraph, scene, ob, NULL, psys);
+ }
+ }
edit = psys->edit;
}
}