archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Particle edit: Make visibility check to be per-particle system

Browse Source 
This way we can see other particle systems while combing another one.
This commit is contained in:
Sergey Sharybin
2018-05-15 11:35:39 +02:00
parent f25be56bc7
commit 361bc2bc50
7 changed files with 110 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/draw/engines/eevee/eevee_materials.c
View File

@@ -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);