diff --git a/apps/openmw/mwrender/activatoranimation.cpp b/apps/openmw/mwrender/activatoranimation.cpp
index a3332d4b5..0dc16ecb6 100644
--- a/apps/openmw/mwrender/activatoranimation.cpp
+++ b/apps/openmw/mwrender/activatoranimation.cpp
@@ -31,19 +31,18 @@ ActivatorAnimation::ActivatorAnimation(const MWWorld::Ptr &ptr)
             Ogre::Entity *ent = mEntityList.mEntities[i];
 
             bool transparent = false;
-            for (unsigned int j=0;j < ent->getNumSubEntities() && !transparent; ++j)
+            for(unsigned int j=0;!transparent && j < ent->getNumSubEntities(); ++j)
             {
                 Ogre::MaterialPtr mat = ent->getSubEntity(j)->getMaterial();
                 Ogre::Material::TechniqueIterator techIt = mat->getTechniqueIterator();
-                while (techIt.hasMoreElements() && !transparent)
+                while(!transparent && techIt.hasMoreElements())
                 {
                     Ogre::Technique* tech = techIt.getNext();
                     Ogre::Technique::PassIterator passIt = tech->getPassIterator();
-                    while (passIt.hasMoreElements() && !transparent)
+                    while(!transparent && passIt.hasMoreElements())
                     {
                         Ogre::Pass* pass = passIt.getNext();
-                        if(pass->getSourceBlendFactor() != Ogre::SBF_ONE || pass->getDestBlendFactor() != Ogre::SBF_ZERO)
-                            transparent = true;
+                        transparent = pass->isTransparent();
                     }
                 }
             }
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 3adb0c448..73bb80547 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -32,19 +32,18 @@ CreatureAnimation::CreatureAnimation(const MWWorld::Ptr &ptr)
             ent->setVisibilityFlags(RV_Actors);
 
             bool transparent = false;
-            for (unsigned int j=0;j < ent->getNumSubEntities() && !transparent; ++j)
+            for(unsigned int j=0;!transparent && j < ent->getNumSubEntities(); ++j)
             {
                 Ogre::MaterialPtr mat = ent->getSubEntity(j)->getMaterial();
                 Ogre::Material::TechniqueIterator techIt = mat->getTechniqueIterator();
-                while (techIt.hasMoreElements() && !transparent)
+                while(!transparent && techIt.hasMoreElements())
                 {
                     Ogre::Technique* tech = techIt.getNext();
                     Ogre::Technique::PassIterator passIt = tech->getPassIterator();
-                    while (passIt.hasMoreElements() && !transparent)
+                    while(!transparent && passIt.hasMoreElements())
                     {
                         Ogre::Pass* pass = passIt.getNext();
-                        if(pass->getSourceBlendFactor() != Ogre::SBF_ONE || pass->getDestBlendFactor() != Ogre::SBF_ZERO)
-                            transparent = true;
+                        transparent = pass->isTransparent();
                     }
                 }
             }
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index ce15841fc..1f1cd0530 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -107,19 +107,18 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, Ogre::SceneNode* node, MWWor
         base->setVisibilityFlags(mVisibilityFlags);
 
         bool transparent = false;
-        for(unsigned int j=0;j < base->getNumSubEntities();++j)
+        for(unsigned int j=0;!transparent && j < base->getNumSubEntities();++j)
         {
             Ogre::MaterialPtr mat = base->getSubEntity(j)->getMaterial();
             Ogre::Material::TechniqueIterator techIt = mat->getTechniqueIterator();
-            while (techIt.hasMoreElements())
+            while(!transparent && techIt.hasMoreElements())
             {
                 Ogre::Technique* tech = techIt.getNext();
                 Ogre::Technique::PassIterator passIt = tech->getPassIterator();
-                while (passIt.hasMoreElements())
+                while(!transparent && passIt.hasMoreElements())
                 {
                     Ogre::Pass* pass = passIt.getNext();
-                    if(pass->getSourceBlendFactor() != Ogre::SBF_ONE || pass->getDestBlendFactor() != Ogre::SBF_ZERO)
-                        transparent = true;
+                    transparent = pass->isTransparent();
                 }
             }
         }
@@ -322,8 +321,26 @@ NifOgre::EntityList NpcAnimation::insertBoundedPart(const std::string &mesh, int
     std::vector<Ogre::Entity*> &parts = entities.mEntities;
     for(size_t i = 0;i < parts.size();i++)
     {
-        parts[i]->setVisibilityFlags(mVisibilityFlags);
         parts[i]->getUserObjectBindings().setUserAny(Ogre::Any(group));
+        parts[i]->setVisibilityFlags(mVisibilityFlags);
+
+        bool transparent = false;
+        for(unsigned int j=0;!transparent && j < parts[i]->getNumSubEntities();++j)
+        {
+            Ogre::MaterialPtr mat = parts[i]->getSubEntity(j)->getMaterial();
+            Ogre::Material::TechniqueIterator techIt = mat->getTechniqueIterator();
+            while(!transparent && techIt.hasMoreElements())
+            {
+                Ogre::Technique* tech = techIt.getNext();
+                Ogre::Technique::PassIterator passIt = tech->getPassIterator();
+                while(!transparent && passIt.hasMoreElements())
+                {
+                    Ogre::Pass* pass = passIt.getNext();
+                    transparent = pass->isTransparent();
+                }
+            }
+        }
+        parts[i]->setRenderQueueGroup(transparent ? RQG_Alpha : RQG_Main);
     }
     if(entities.mSkelBase)
     {
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 9aa65ac99..fb2b0e50a 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -134,22 +134,21 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh, bool
     mBounds[ptr.getCell()].merge(bounds);
 
     bool transparent = false;
-    for(size_t i = 0;i < entities.mEntities.size();i++)
+    for(size_t i = 0;!transparent && i < entities.mEntities.size();i++)
     {
         Ogre::Entity *ent = entities.mEntities[i];
-        for (unsigned int i=0; i<ent->getNumSubEntities(); ++i)
+        for(unsigned int i=0;!transparent && i < ent->getNumSubEntities(); ++i)
         {
             Ogre::MaterialPtr mat = ent->getSubEntity(i)->getMaterial();
             Ogre::Material::TechniqueIterator techIt = mat->getTechniqueIterator();
-            while (techIt.hasMoreElements())
+            while(!transparent && techIt.hasMoreElements())
             {
                 Ogre::Technique* tech = techIt.getNext();
                 Ogre::Technique::PassIterator passIt = tech->getPassIterator();
-                while (passIt.hasMoreElements())
+                while(!transparent && passIt.hasMoreElements())
                 {
                     Ogre::Pass* pass = passIt.getNext();
-                    if(pass->getSourceBlendFactor() != Ogre::SBF_ONE || pass->getDestBlendFactor() != Ogre::SBF_ZERO)
-                        transparent = true;
+                    transparent = pass->isTransparent();
                 }
             }
         }