Page MenuHome
Differential D2927 Diff 9587 source/blender/collada/collada_utils.cpp

Changeset View

Standalone View

View Options

source/blender/collada/collada_utils.cpp

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines
{ {
Object *ob = BKE_object_add_only_object(G.main, type, name); Object *ob = BKE_object_add_only_object(G.main, type, name);
ob->data = BKE_object_obdata_add_from_type(G.main, type, name); ob->data = BKE_object_obdata_add_from_type(G.main, type, name);
ob->lay = scene->lay; ob->lay = scene->lay;
DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); 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). */ /* XXX Collada should use the context scene layer, not the scene one. (dfelinto/gaia). */
SceneLayer *scene_layer = BKE_scene_layer_context_active_PLACEHOLDER(scene); ViewLayer *view_layer = BKE_view_layer_context_active_PLACEHOLDER(scene);
LayerCollection *layer_collection = BKE_layer_collection_get_active_ensure(scene, scene_layer); LayerCollection *layer_collection = BKE_layer_collection_get_active_ensure(scene, view_layer);
BKE_collection_object_add(scene, layer_collection->scene_collection, ob); BKE_collection_object_add(scene, layer_collection->scene_collection, ob);
Base *base = BKE_scene_layer_base_find(scene_layer, ob); Base *base = BKE_view_layer_base_find(view_layer, ob);
BKE_scene_layer_base_select(scene_layer, base); BKE_view_layer_base_select(view_layer, base);
return ob; return ob;
} }
Mesh *bc_get_mesh_copy(const struct EvaluationContext *eval_ctx, Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate) Mesh *bc_get_mesh_copy(const struct EvaluationContext *eval_ctx, Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate)
{ {
Mesh *tmpmesh; Mesh *tmpmesh;
CustomDataMask mask = CD_MASK_MESH; CustomDataMask mask = CD_MASK_MESH;
▲ Show 20 Lines • Show All 685 Lines • Show Last 20 Lines