[Bf-blender-cvs] [119423b252c] blender2.8: Eevee: Cleanup unused Ghash

Clément Foucault noreply at git.blender.org
Sat Jun 2 21:22:40 CEST 2018


Commit: 119423b252c405b674c790b85962e5321882a9f4
Author: Clément Foucault
Date:   Sat Jun 2 12:07:32 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB119423b252c405b674c790b85962e5321882a9f4

Eevee: Cleanup unused Ghash

===================================================================

M	source/blender/draw/engines/eevee/eevee_materials.c
M	source/blender/draw/engines/eevee/eevee_private.h

===================================================================

diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index e15bc14f759..c4eea12cc03 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -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)
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 1039d069053..c7fe5e30c0f 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -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];



More information about the Bf-blender-cvs mailing list