diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-15 12:35:39 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-15 18:20:02 +0300 |
commit | 361bc2bc507fc187c205781130df9fed11907455 (patch) | |
tree | bb30a4b172574e361d37f4827e74ca435aa46778 /source/blender/draw/engines | |
parent | f25be56bc785b76c9ee19c8e67e76c7c21ea117b (diff) |
Particle edit: Make visibility check to be per-particle system
This way we can see other particle systems while combing another one.
Diffstat (limited to 'source/blender/draw/engines')
4 files changed, 32 insertions, 38 deletions
diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c index 67481a68162..fe368872d48 100644 --- a/source/blender/draw/engines/basic/basic_engine.c +++ b/source/blender/draw/engines/basic/basic_engine.c @@ -140,30 +140,27 @@ static void basic_cache_populate(void *vedata, Object *ob) { BASIC_StorageList *stl = ((BASIC_Data *)vedata)->stl; - if (!DRW_object_is_renderable(ob)) - return; - - if (!DRW_check_particles_visible_within_active_context(ob)) { + if (!DRW_object_is_renderable(ob)) { return; } const DRWContextState *draw_ctx = DRW_context_state_get(); + if (ob == draw_ctx->object_edit) { + return; + } - if (ob != draw_ctx->object_edit) { - for (ParticleSystem *psys = ob->particlesystem.first; psys; psys = psys->next) { - if (psys_check_enabled(ob, psys, false)) { - ParticleSettings *part = psys->part; - int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as; - - if (draw_as == PART_DRAW_PATH && !psys->pathcache && !psys->childcache) { - draw_as = PART_DRAW_DOT; - } - - if (draw_as == PART_DRAW_PATH) { - struct Gwn_Batch *hairs = DRW_cache_particles_get_hair(psys, NULL); - DRW_shgroup_call_add(stl->g_data->depth_shgrp, hairs, NULL); - } - } + for (ParticleSystem *psys = ob->particlesystem.first; psys; psys = psys->next) { + if (!psys_check_enabled(ob, psys, false)) { + continue; + } + if (!DRW_check_psys_visible_within_active_context(ob, psys)) { + return; + } + ParticleSettings *part = psys->part; + const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as; + if (draw_as == PART_DRAW_PATH) { + struct Gwn_Batch *hairs = DRW_cache_particles_get_hair(psys, NULL); + DRW_shgroup_call_add(stl->g_data->depth_shgrp, hairs, NULL); } } diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c index 0ae27a4f5ef..2be914cb234 100644 --- a/source/blender/draw/engines/clay/clay_engine.c +++ b/source/blender/draw/engines/clay/clay_engine.c @@ -833,21 +833,15 @@ static void clay_cache_populate_particles(void *vedata, Object *ob) return; } - if (!DRW_check_particles_visible_within_active_context(ob)) { - return; - } - for (ParticleSystem *psys = ob->particlesystem.first; psys; psys = psys->next) { if (!psys_check_enabled(ob, psys, false)) { continue; } - ParticleSettings *part = psys->part; - int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as; - - if (draw_as == PART_DRAW_PATH && !psys->pathcache && !psys->childcache) { - draw_as = PART_DRAW_DOT; + if (!DRW_check_psys_visible_within_active_context(ob, psys)) { + return; } - + ParticleSettings *part = psys->part; + const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as; if (draw_as == PART_DRAW_PATH) { struct Gwn_Batch *geom = DRW_cache_particles_get_hair(psys, NULL); DRWShadingGroup *hair_shgrp = CLAY_hair_shgrp_get(vedata, ob, stl, psl); diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 304baff6672..44a117ab9d3 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1472,7 +1472,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sld } if (ob->type == OB_MESH) { - if (DRW_check_particles_visible_within_active_context(ob)) { + if (ob != draw_ctx->object_edit) { material_hash = stl->g_data->hair_material_hash; for (ModifierData *md = ob->modifiers.first; md; md = md->next) { if (md->type != eModifierType_ParticleSystem) { @@ -1482,9 +1482,12 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sld if (!psys_check_enabled(ob, psys, false)) { continue; } + if (!DRW_check_psys_visible_within_active_context(ob, psys)) { + continue; + } ParticleSettings *part = psys->part; - int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as; - if (draw_as != PART_DRAW_PATH || (psys->pathcache == NULL && psys->childcache == NULL)) { + const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as; + if (draw_as != PART_DRAW_PATH) { continue; } struct Gwn_Batch *hair_geom = DRW_cache_particles_get_hair(psys, md); diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index 553f4801d19..1013623260c 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -488,19 +488,19 @@ static WORKBENCH_MaterialData *get_or_create_material_data(WORKBENCH_Data *vedat static void workbench_cache_populate_particles(WORKBENCH_Data *vedata, Object *ob) { - if (!DRW_check_particles_visible_within_active_context(ob)) { + const DRWContextState *draw_ctx = DRW_context_state_get(); + if (ob == draw_ctx->object_edit) { return; } for (ParticleSystem *psys = ob->particlesystem.first; psys != NULL; psys = psys->next) { if (!psys_check_enabled(ob, psys, false)) { continue; } - ParticleSettings *part = psys->part; - int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as; - - if (draw_as == PART_DRAW_PATH && !psys->pathcache && !psys->childcache) { - draw_as = PART_DRAW_DOT; + if (!DRW_check_psys_visible_within_active_context(ob, psys)) { + return; } + ParticleSettings *part = psys->part; + const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as; static float mat[4][4]; unit_m4(mat); |