diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-02-23 12:56:28 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-02-23 12:56:28 +0300 |
| commit | b46b2834b9596b9a7c026dd2e041a329cda9bb59 (patch) | |
| tree | 2b1c36f3ab62159a511b67dacc422542d0f91b87 /source/blender/collada | |
| parent | 53a9dec2bfecc8a2c863d850bcec05aafb008bac (diff) | |
| parent | 9dd194716b0f43fa02ae6cd32ada556d8d622390 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/SkinInfo.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp index 7242a24523c..71875d6274a 100644 --- a/source/blender/collada/SkinInfo.cpp +++ b/source/blender/collada/SkinInfo.cpp @@ -230,7 +230,6 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique ModifierData *md = ED_object_modifier_add(NULL, bmain, scene, ob, NULL, eModifierType_Armature); ArmatureModifierData *amd = (ArmatureModifierData *)md; amd->object = ob_arm; - struct bArmature *armature = (bArmature *)ob_arm->data; #if 1 bc_set_parent(ob, ob_arm, C); |