Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/io')
-rw-r--r--source/blender/io/collada/BCAnimationSampler.h3
-rw-r--r--source/blender/io/collada/DocumentImporter.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/io/collada/BCAnimationSampler.h b/source/blender/io/collada/BCAnimationSampler.h
index 34aec00374e..f7f2464a637 100644
--- a/source/blender/io/collada/BCAnimationSampler.h
+++ b/source/blender/io/collada/BCAnimationSampler.h
@@ -40,7 +40,8 @@ class BCAnimation {
BCAnimation(bContext *C, Object *ob) : mContext(C)
{
Main *bmain = CTX_data_main(mContext);
- reference = BKE_object_copy(bmain, ob);
+ reference = (Object *)BKE_id_copy(bmain, &ob->id);
+ id_us_min(&reference->id);
}
~BCAnimation()
diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp
index da95130a06c..083d7258d0a 100644
--- a/source/blender/io/collada/DocumentImporter.cpp
+++ b/source/blender/io/collada/DocumentImporter.cpp
@@ -415,7 +415,8 @@ Object *DocumentImporter::create_instance_node(Object *source_ob,
// source_node->getOriginalId().c_str() : NULL);
Main *bmain = CTX_data_main(mContext);
- Object *obn = BKE_object_copy(bmain, source_ob);
+ Object *obn = (Object *)BKE_id_copy(bmain, &source_ob->id);
+ id_us_min(&obn->id);
DEG_id_tag_update(&obn->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
BKE_collection_object_add_from(bmain, sce, source_ob, obn);