blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Eevee: Cleanup unused Ghash

This commit is contained in:
Clément Foucault 2018-06-02 12:07:32 +02:00
parent 8ace49dedc
commit 119423b252
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -941,7 +941,6 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
/* Create Material Ghash */
{
stl->g_data->material_hash = BLI_ghash_ptr_new("Eevee_material ghash");
stl->g_data->hair_material_hash = BLI_ghash_ptr_new("Eevee_hair_material ghash");
}
{
@ -1587,7 +1586,6 @@ void EEVEE_hair_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sldata,
if (ob->type == OB_MESH) {
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) {
continue;
@ -1728,7 +1726,6 @@ void EEVEE_materials_cache_finish(EEVEE_Data *vedata)
/* END */
BLI_ghash_free(stl->g_data->material_hash, NULL, MEM_freeN);
BLI_ghash_free(stl->g_data->hair_material_hash, NULL, NULL);
}
void EEVEE_materials_free(void)

1
source/blender/draw/engines/eevee/eevee_private.h
View File

@ -783,7 +783,6 @@ typedef struct EEVEE_PrivateData {
struct DRWShadingGroup *cube_display_shgrp;
struct DRWShadingGroup *planar_display_shgrp;
struct GHash *material_hash;
struct GHash *hair_material_hash;
float background_alpha; /* TODO find a better place for this. */
/* For planar probes */
float planar_texel_size[2];