[Bf-blender-cvs] [526876a6348] master: Fix T61770 Multiple Hair Systems Not visible while in particle edit mode
Clément Foucault
noreply at git.blender.org
Wed Jul 10 14:44:20 CEST 2019
Commit: 526876a6348f63f634c8357b2949cf208d688321
Author: Clément Foucault
Date: Wed Jul 10 14:43:58 2019 +0200
Branches: master
https://developer.blender.org/rB526876a6348f63f634c8357b2949cf208d688321
Fix T61770 Multiple Hair Systems Not visible while in particle edit mode
The check was for the whole object instead of individual particle system.
===================================================================
M source/blender/draw/intern/draw_cache_impl_particles.c
===================================================================
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);
}
More information about the Bf-blender-cvs
mailing list