diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:53:27 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:53:27 +0300 |
| commit | be57cf9b2a0e1be577211839487cacd288886c1a (patch) | |
| tree | e5a9e80db484a2b1c71fc0acfc31a4591fff427e /source/blender/collada/ArmatureImporter.cpp | |
| parent | 5508b572ea9bb2d3b758cae6898035005e8ebb2a (diff) | |
Cleanup: remove moar G.main from BKE area.
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index cfb25f5d117..344a73cfa6f 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -854,8 +854,9 @@ bool ArmatureImporter::write_controller(const COLLADAFW::Controller *controller) return true; } -void ArmatureImporter::make_shape_keys() +void ArmatureImporter::make_shape_keys(bContext *C) { + Main *bmain = CTX_data_main(C); std::vector<COLLADAFW::MorphController *>::iterator mc; float weight; @@ -871,7 +872,7 @@ void ArmatureImporter::make_shape_keys() Mesh *source_me = (Mesh *)source_ob->data; //insert key to source mesh - Key *key = source_me->key = BKE_key_add((ID *)source_me); + Key *key = source_me->key = BKE_key_add(bmain, (ID *)source_me); key->type = KEY_RELATIVE; KeyBlock *kb; |