Merge remote branch 'jhooks/clothingarmor'

13 years ago · 14ddcc1204
parent 0c739825f2 950378ff65
commit 14ddcc1204
1 changed files with 2 additions and 2 deletions
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@ -436,14 +436,14 @@ void NpcAnimation::updateParts(){
                }
                  if(partpriorities[ESM::PRT_RFoot] < 1){
                    const ESM::BodyPart *footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "foot");
-                    if(isBeast)
+                    if(isBeast && !footPart)
                        footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "feet");
                    if(footPart)
                        addOrReplaceIndividualPart(ESM::PRT_RFoot, -1,1,"meshes\\" + footPart->model);
                }
                  if(partpriorities[ESM::PRT_LFoot] < 1){
                    const ESM::BodyPart *footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "foot");
-                    if(isBeast)
+                    if(isBeast && !footPart)
                        footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "feet");
                    if(footPart)
                        addOrReplaceIndividualPart(ESM::PRT_LFoot, -1,1,"meshes\\" + footPart->model);