diff options
| author | Joshua Leung <aligorith@gmail.com> | 2012-05-06 08:50:04 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2012-05-06 08:50:04 +0400 |
| commit | 364388b9f2a2ddc838f8182537c1ddf3f0ea0f0b (patch) | |
| tree | 79e6462a2be21d0cad68307a88bb5c58d71afd02 /source/blender/collada/SkinInfo.cpp | |
| parent | 5d02292d3cbdc1eb8657a2e186de7ac38bc226b7 (diff) | |
Removing the old armature 'deform' settings (use vertex groups/envelopes/quats).
As far as I could tell, these were really only still used for "virtual
modifiers", though we really don't use these anymore. Instead, most of the time,
people need to set these settings in armature modifiers directly (these didn't
even get copied over in that case). This was a source of confusion and
redundancy, so removing these now.
This change can be reverted if these were actually of some use out there...
Diffstat (limited to 'source/blender/collada/SkinInfo.cpp')
| -rw-r--r-- | source/blender/collada/SkinInfo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp index f7cb7dc96c2..edc8981deab 100644 --- a/source/blender/collada/SkinInfo.cpp +++ b/source/blender/collada/SkinInfo.cpp @@ -218,7 +218,8 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique Scene *scene = CTX_data_scene(C); ModifierData *md = ED_object_modifier_add(NULL, bmain, scene, ob, NULL, eModifierType_Armature); - ((ArmatureModifierData *)md)->object = ob_arm; + ArmatureModifierData *amd = (ArmatureModifierData *)md; + amd->object = ob_arm; copy_m4_m4(ob->obmat, bind_shape_matrix); BKE_object_apply_mat4(ob, ob->obmat, 0, 0); @@ -239,7 +240,7 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL); #endif - ((bArmature*)ob_arm->data)->deformflag = ARM_DEF_VGROUP; + amd->deformflag = ARM_DEF_VGROUP; // create all vertex groups std::vector<JointData>::iterator it; |