From 4594a1374098250c7654df24662d859f5dd08309 Mon Sep 17 00:00:00 2001 From: Areloch Date: Wed, 16 Apr 2014 10:38:53 -0500 Subject: [PATCH] Fixed the assert crash by making sure the glow material instance keeps the original material instance's user object --- Engine/source/renderInstance/renderGlowMgr.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Engine/source/renderInstance/renderGlowMgr.cpp b/Engine/source/renderInstance/renderGlowMgr.cpp index 86bbadcbc..e3801e85e 100644 --- a/Engine/source/renderInstance/renderGlowMgr.cpp +++ b/Engine/source/renderInstance/renderGlowMgr.cpp @@ -54,6 +54,7 @@ RenderGlowMgr::GlowMaterialHook::GlowMaterialHook( BaseMatInstance *matInst ) { mGlowMatInst = (MatInstance*)matInst->getMaterial()->createMatInstance(); mGlowMatInst->getFeaturesDelegate().bind( &GlowMaterialHook::_overrideFeatures ); + mGlowMatInst->setUserObject(matInst->getUserObject()); mGlowMatInst->init( matInst->getRequestedFeatures(), matInst->getVertexFormat() ); }