diff options
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 5 | ||||
-rw-r--r-- | source/blender/collada/ArmatureImporter.h | 2 | ||||
-rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 |
3 files changed, 5 insertions, 4 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; diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h index 87a7ae73a24..b637ec89f8b 100644 --- a/source/blender/collada/ArmatureImporter.h +++ b/source/blender/collada/ArmatureImporter.h @@ -145,7 +145,7 @@ public: // here we add bones to armatures, having armatures previously created in write_controller void make_armatures(bContext *C, std::vector<Object *> &objects_to_scale); - void make_shape_keys(); + void make_shape_keys(bContext *C); #if 0 // link with meshes, create vertex groups, assign weights diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index b77fdf09b20..5cbffbe4526 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -240,7 +240,7 @@ void DocumentImporter::finish() armature_importer.set_tags_map(this->uid_tags_map); armature_importer.make_armatures(mContext, *objects_to_scale); - armature_importer.make_shape_keys(); + armature_importer.make_shape_keys(mContext); DAG_relations_tag_update(bmain); #if 0 |