blender
/
blender
133
398
Fork 578
Code Issues 6.3k Pull Requests 744 Projects 19 Wiki Activity

Particle edit: Allow children to be visible in edit mode 

Follows tool settings, tested without copy-on-write.

Enabling copy-on-write still needs verification and likely some fixing.
This commit is contained in:
Sergey Sharybin 2018-05-15 12:46:33 +02:00
parent f4fd1f1f4b
commit e57ba1daf5
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/draw/intern/draw_manager.c
View File

@ -226,12 +226,23 @@ bool DRW_check_psys_visible_within_active_context(
struct ParticleSystem *psys)
{
const DRWContextState *draw_ctx = DRW_context_state_get();
const Scene *scene = draw_ctx->scene;
if (object == draw_ctx->object_edit) {
return false;
}
const ParticleSettings *part = psys->part;
const ParticleEditSettings *pset = &scene->toolsettings->particle;
if (object->mode == OB_MODE_PARTICLE_EDIT) {
if (psys_in_edit_mode(draw_ctx->depsgraph, psys)) {
return false;
if ((pset->flag & PE_DRAW_PART) == 0) {
return false;
}
if ((part->childtype == 0) &&
(psys->flag & PSYS_HAIR_DYNAMICS &&
psys->pointcache->flag & PTCACHE_BAKED)==0)
{
return false;
}
}
}
return true;