griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Philipp Oeser
2024-06-24 13:01:40 +02:00
parent a09edde30d 696848204c
commit a196f4276e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/io/ply/importer/ply_import.cc
View File

@@ -213,7 +213,7 @@ void importer_main(Main *bmain,
BKE_view_layer_base_deselect_all(scene, view_layer);
LayerCollection *lc = BKE_layer_collection_get_active(view_layer);
Object *obj = BKE_object_add_only_object(bmain, OB_MESH, ob_name);
BKE_mesh_assign_object(bmain, obj, mesh_in_main);
obj->data = mesh_in_main;
BKE_collection_object_add(bmain, lc->collection, obj);
BKE_view_layer_synced_ensure(scene, view_layer);
Base *base = BKE_view_layer_base_find(view_layer, obj);

2
source/blender/io/stl/importer/stl_import.cc
View File

@@ -126,7 +126,7 @@ void importer_main(Main *bmain,
BKE_view_layer_base_deselect_all(scene, view_layer);
LayerCollection *lc = BKE_layer_collection_get_active(view_layer);
Object *obj = BKE_object_add_only_object(bmain, OB_MESH, ob_name);
BKE_mesh_assign_object(bmain, obj, mesh_in_main);
obj->data = mesh_in_main;
BKE_collection_object_add(bmain, lc->collection, obj);
BKE_view_layer_synced_ensure(scene, view_layer);
Base *base = BKE_view_layer_base_find(view_layer, obj);