Multiple armatures<>mesh objects now work with name flipping.

previously would only work if the armature was the first in the meshes modifier list,
in that case the armature would be name flipped but the mesh would not)

2 files changed, 16 insertions, 0 deletions

diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index b90758a52fb..ecbfeed157a 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -202,6 +202,7 @@ int				modifiers_getCageIndex		(struct Object *ob, int *lastPossibleCageIndex_r)
 
 int				modifiers_isSoftbodyEnabled	(struct Object *ob);
 struct Object*	modifiers_isDeformedByArmature(struct Object *ob);
+int				modifiers_usesArmature(struct Object *ob, struct bArmature *arm);
 int				modifiers_isDeformed		(struct Object *ob);
 
 ModifierData*	modifiers_getVirtualModifierList	(struct Object *ob);
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 39e61fd63e3..edda9f7a9a1 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -2125,6 +2125,21 @@ Object *modifiers_isDeformedByArmature(Object *ob)
 	return NULL;
 }
 
+int modifiers_usesArmature(Object *ob, bArmature *arm)
+{
+	ModifierData *md = modifiers_getVirtualModifierList(ob);
+
+	for (; md; md=md->next) {
+		if (md->type==eModifierType_Armature) {
+			ArmatureModifierData *amd = (ArmatureModifierData*) md;
+			if (amd->object->data==arm) 
+				return 1;
+		}
+	}
+
+	return NULL;
+}
+
 int modifiers_isDeformed(Object *ob)
 {
 	ModifierData *md = modifiers_getVirtualModifierList(ob);