Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-07-17 11:28:32 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-07-17 11:39:42 +0300
commit9e9fbb39d7f9e0a63c71fbc96237ace62fae0db6 (patch)
tree426732e1d8152a71d8551746ba4ea06ee72ae812 /source/blender/blenkernel/intern/modifier.c
parentf8a70db5565413fc454091e4fbbc4a7b5fd92519 (diff)
Fix T66949: Can't select bones from multiple objects in wpaint mode
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
-rw-r--r--source/blender/blenkernel/intern/modifier.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index c23fe30d311..144fedb4c8a 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -778,6 +778,23 @@ bool modifiers_usesArmature(Object *ob, bArmature *arm)
return false;
}
+bool modifiers_usesArmatureObject(Object *ob, Object *ob_armature)
+{
+ VirtualModifierData virtualModifierData;
+ ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
+
+ for (; md; md = md->next) {
+ if (md->type == eModifierType_Armature) {
+ ArmatureModifierData *amd = (ArmatureModifierData *)md;
+ if (amd->object && amd->object == ob_armature) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
bool modifiers_usesSubsurfFacedots(struct Scene *scene, Object *ob)
{
/* Search (backward) in the modifier stack to find if we have a subsurf modifier (enabled) before