diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-01-26 15:13:54 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-01-26 15:37:45 +0300 |
| commit | 376fc19b240299857b088a1a21ced7e8b9cceacc (patch) | |
| tree | 288f0c376cc63190abe1d3d8f6df1d77fc15d7f6 /source/blender/collada/collada_utils.cpp | |
| parent | f71d8f6b4889a97f79c37e878145a51d43cd619e (diff) | |
fix:T53271 now using the context scene layer as requested
Diffstat (limited to 'source/blender/collada/collada_utils.cpp')
| -rw-r--r-- | source/blender/collada/collada_utils.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 6a52027fb47..f351ebf7952 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -135,7 +135,7 @@ int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space) return true; } -Object *bc_add_object(Scene *scene, int type, const char *name) +Object *bc_add_object(Scene *scene, ViewLayer *view_layer, int type, const char *name) { Object *ob = BKE_object_add_only_object(G.main, type, name); @@ -143,9 +143,6 @@ Object *bc_add_object(Scene *scene, int type, const char *name) ob->lay = scene->lay; DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); - /* XXX Collada should use the context scene layer, not the scene one. (dfelinto/gaia). */ - ViewLayer *view_layer = BKE_view_layer_context_active_PLACEHOLDER(scene); - LayerCollection *layer_collection = BKE_layer_collection_get_active_ensure(scene, view_layer); BKE_collection_object_add(&scene->id, layer_collection->scene_collection, ob); |