resolve merge conflicts

Author: Aviii06

rootex/framework/components/visual/model/renderable_component.h

@@ -41,7 +41,7 @@ class RenderableComponent : public Component
 	virtual bool addAffectingStaticLight(SceneID id);
 	virtual void removeAffectingStaticLight(SceneID id);
 
-	void setMaterialOverride(MaterialResourceFile* oldMaterial, Ref<MaterialResourceFile> newMaterial);
+	virtual void setMaterialOverride(MaterialResourceFile* oldMaterial, Ref<MaterialResourceFile> newMaterial);
 	Ref<MaterialResourceFile> getMaterialOverride(MaterialResourceFile* material) { return m_MaterialOverrides.at(material); }
 
 	unsigned int getRenderPass() const { return m_RenderPass; }

rootex/framework/components/visual/model/sprite_component.cpp

@@ -85,10 +85,10 @@ void SpriteComponent::postRender()
 Ref<MaterialResourceFile> SpriteComponent::getOverridingMaterialResourceFile()
 {
 	auto& [material, meshes] = getMeshes()[0];
-	return m_MaterialOverrides.at(material);
+	return m_MaterialOverrides.at(material.get());
 }
 
-void SpriteComponent::setMaterialOverride(Ref<MaterialResourceFile> oldMaterial, Ref<MaterialResourceFile> newMaterial)
+void SpriteComponent::setMaterialOverride(MaterialResourceFile* oldMaterial, Ref<MaterialResourceFile> newMaterial)
 {
 	RenderableComponent::setMaterialOverride(oldMaterial, newMaterial);
 	adjustScaling();

rootex/framework/components/visual/model/sprite_component.h

@@ -12,7 +12,7 @@ class SpriteComponent : public ModelComponent
 	bool m_IsBillboarded;
 
 	void adjustScaling();
-	void setMaterialOverride(Ref<MaterialResourceFile> oldMaterial, Ref<MaterialResourceFile> newMaterial) override;
+	void setMaterialOverride(MaterialResourceFile* oldMaterial, Ref<MaterialResourceFile> newMaterial) override;
 
 	static JSON::json InjectSpriteModel(const JSON::json& data);