diff options
| author | Luca Rood <dev@lucarood.com> | 2017-07-21 12:53:13 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-07-21 15:47:26 +0300 |
| commit | 1c4c288727214fa0588d66556a1cdf71755d70b4 (patch) | |
| tree | 1433952be7e88cc7d09e8563831995290e3013ce /source/blender/collada/SkinInfo.cpp | |
| parent | 9edb7e49d7e5e69385f3a0434c568c79fad88cd8 (diff) | |
Pass EvaluationContext argument everywhere
Note that some little parts of code have been dissabled because eval_ctx
was not available there. This should be resolved once DerivedMesh is
replaced.
Diffstat (limited to 'source/blender/collada/SkinInfo.cpp')
| -rw-r--r-- | source/blender/collada/SkinInfo.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp index c29f1748efc..9d89d9d78e4 100644 --- a/source/blender/collada/SkinInfo.cpp +++ b/source/blender/collada/SkinInfo.cpp @@ -226,6 +226,9 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); + EvaluationContext eval_ctx; + + CTX_data_eval_ctx(C, &eval_ctx); ModifierData *md = ED_object_modifier_add(NULL, bmain, scene, ob, NULL, eModifierType_Armature); ArmatureModifierData *amd = (ArmatureModifierData *)md; @@ -247,7 +250,7 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); #endif copy_m4_m4(ob->obmat, bind_shape_matrix); - BKE_object_apply_mat4(ob, ob->obmat, 0, 0); + BKE_object_apply_mat4(&eval_ctx, ob, ob->obmat, 0, 0); amd->deformflag = ARM_DEF_VGROUP; |