1 files changed, 16 insertions, 0 deletions
diff --git a/source/gameengine/Converter/BL_ModifierDeformer.cpp b/source/gameengine/Converter/BL_ModifierDeformer.cpp
index e28ea47b162..5ccf8de29b1 100644
--- a/source/gameengine/Converter/BL_ModifierDeformer.cpp
+++ b/source/gameengine/Converter/BL_ModifierDeformer.cpp
@@ -114,11 +114,27 @@ bool BL_ModifierDeformer::HasCompatibleDeformer(Object *ob)
 			continue;
 		if (!(md->mode & eModifierMode_Realtime))
 			continue;
+		/* armature modifier are handled by SkinDeformer, not ModifierDeformer */
+		if (md->type == eModifierType_Armature )
+			continue;
 		return true;
 	}
 	return false;
 }
 
+bool BL_ModifierDeformer::HasArmatureDeformer(Object *ob)
+{
+	if (!ob->modifiers.first)
+		return false;
+
+	ModifierData* md;
+	for (md = (ModifierData*)ob->modifiers.first; md; md = (ModifierData*)md->next) {
+		if (md->type == eModifierType_Armature )
+			return true;
+	}
+	return false;
+}
+
 bool BL_ModifierDeformer::Update(void)
 {
 	bool bShapeUpdate = BL_ShapeDeformer::Update();