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:
authorClément Foucault <foucault.clem@gmail.com>2019-07-10 15:43:58 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-07-10 15:44:09 +0300
commit526876a6348f63f634c8357b2949cf208d688321 (patch)
tree20af1cb8dbfdf2c8a13729c8d7373619819a84af /source/blender/draw/intern/draw_cache_impl_particles.c
parentb39d7e484c6be45fb8ffe0809aecb5726b7d1936 (diff)
Fix T61770 Multiple Hair Systems Not visible while in particle edit mode
The check was for the whole object instead of individual particle system.
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_particles.c')
-rw-r--r--source/blender/draw/intern/draw_cache_impl_particles.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c
index 9e25c5168cc..6cd03d14bfd 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -1445,11 +1445,12 @@ static void drw_particle_get_hair_source(Object *object,
PTCacheEdit *edit,
ParticleDrawSource *r_draw_source)
{
+ const DRWContextState *draw_ctx = DRW_context_state_get();
r_draw_source->object = object;
r_draw_source->psys = psys;
r_draw_source->md = md;
r_draw_source->edit = edit;
- if ((object->mode & OB_MODE_PARTICLE_EDIT) != 0) {
+ if (psys_in_edit_mode(draw_ctx->depsgraph, psys)) {
r_draw_source->object = DEG_get_original_object(object);
r_draw_source->psys = psys_orig_get(psys);
}