diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 17:43:11 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 17:43:11 +0300 |
commit | 59bb5d3a89d4379ccc74138aa0d4cd4ce2d8a093 (patch) | |
tree | 327e15b250eb59608598d82aee2ec3d2d8aa1a03 /source/blender/collada | |
parent | a03fb428417fa12e731a31851eb282210736d1cf (diff) |
Cleanup: some remaining G.main's in COllada in 2.8...
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 7aeed15ee87..c6ba3b8f4ac 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -412,7 +412,7 @@ Object *DocumentImporter::create_instance_node(Object *source_ob, COLLADAFW::Nod Main *bmain = CTX_data_main(mContext); Object *obn = BKE_object_copy(bmain, source_ob); DEG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); - BKE_collection_object_add_from(G.main, sce, source_ob, obn); + BKE_collection_object_add_from(bmain, sce, source_ob, obn); if (instance_node) { anim_importer.read_node_transform(instance_node, obn); diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 61a97a45a6e..4ded9bd2d86 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -157,7 +157,7 @@ Object *bc_add_object(Main *bmain, Scene *scene, ViewLayer *view_layer, int type DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); LayerCollection *layer_collection = BKE_layer_collection_get_active(view_layer); - BKE_collection_object_add(G.main, layer_collection->collection, ob); + BKE_collection_object_add(bmain, layer_collection->collection, ob); Base *base = BKE_view_layer_base_find(view_layer, ob); BKE_view_layer_base_select(view_layer, base); |