diff --git a/doomsday/engine/include/resource/material.h b/doomsday/engine/include/resource/material.h index eaf73c4ea1..3a756230f5 100644 --- a/doomsday/engine/include/resource/material.h +++ b/doomsday/engine/include/resource/material.h @@ -95,15 +95,6 @@ void Material_Ticker(material_t *mat, timespan_t time); int Material_VariantCount(material_t const *mat); -/** - * Add a new variant to the list of resources for this Material. - * Material takes ownership of the variant. - * - * @param variant Variant instance to add to the resource list. - */ -struct materialvariant_s *Material_AddVariant(material_t *mat, - struct materialvariant_s *variant); - /** * Destroys all derived MaterialVariants linked with this Material. */ diff --git a/doomsday/engine/src/resource/material.cpp b/doomsday/engine/src/resource/material.cpp index 9ccc039c81..054c9c974e 100644 --- a/doomsday/engine/src/resource/material.cpp +++ b/doomsday/engine/src/resource/material.cpp @@ -84,6 +84,17 @@ struct material_s } prepared = 0; } + + /** + * Add a new variant to the list of resources for this Material. + * Material takes ownership of the variant. + * + * @param variant Variant instance to add to the list. + */ + void addVariant(de::MaterialVariant &variant) + { + variants.push_back(&variant); + } }; namespace de { @@ -572,13 +583,6 @@ void Material_SetShinyMaskTexture(material_t *mat, struct texture_s *tex) mat->shinyMaskTex = reinterpret_cast(tex); } -struct materialvariant_s *Material_AddVariant(material_t *mat, struct materialvariant_s *variant) -{ - DENG2_ASSERT(mat && variant); - mat->variants.push_back(reinterpret_cast(variant)); - return variant; -} - Material::Variants const &Material_Variants(material_t const *mat) { return mat->variants; @@ -606,7 +610,7 @@ MaterialVariant *Material_ChooseVariant(material_t *mat, if(!canCreate) return 0; variant = new MaterialVariant(*mat, spec, *Material_Definition(mat)); - Material_AddVariant(mat, reinterpret_cast(variant)); + mat->addVariant(*variant); } if(smoothed)