diff --git a/AUTHORS.md b/AUTHORS.md index 7f1f91892..2a7ed1ed9 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -74,6 +74,7 @@ Programmers Karl-Felix Glatzer (k1ll) Kevin Poitra (PuppyKevin) Koncord + Kurnevsky Evgeny (kurnevsky) Lars Söderberg (Lazaroth) lazydev Leon Saunders (emoose) diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp index 5c5fc3899..5865c32b9 100644 --- a/apps/openmw/mwmechanics/spellcasting.cpp +++ b/apps/openmw/mwmechanics/spellcasting.cpp @@ -913,7 +913,7 @@ namespace MWMechanics MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(mCaster); - if (mCaster.getClass().isActor()) // TODO: Non-actors should also create a spell cast vfx + if (animation && mCaster.getClass().isActor()) // TODO: Non-actors should also create a spell cast vfx even if they are disabled (animation == NULL) { const ESM::Static* castStatic; @@ -927,7 +927,7 @@ namespace MWMechanics animation->addEffect("meshes\\" + castStatic->mModel, effect->mIndex, false, "", texture); } - if (!mCaster.getClass().isActor()) + if (animation && !mCaster.getClass().isActor()) animation->addSpellCastGlow(effect); static const std::string schools[] = {