From f55a178db06d6c3bf06ae8c33525d6d1c48c9572 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 14 Jan 2019 21:08:22 +0100 Subject: Cleanup: rename BKE_libblock_free_us to BKE_id_free_us. --- source/blender/collada/DocumentImporter.cpp | 4 ++-- source/blender/collada/MeshImporter.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index e59483fa93c..3ba4129c91c 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -379,7 +379,7 @@ Object *DocumentImporter::create_camera_object(COLLADAFW::InstanceCamera *camera Camera *cam = uid_camera_map[cam_uid]; Camera *old_cam = (Camera *)ob->data; ob->data = cam; - BKE_libblock_free_us(bmain, old_cam); + BKE_id_free_us(bmain, old_cam); return ob; } @@ -396,7 +396,7 @@ Object *DocumentImporter::create_lamp_object(COLLADAFW::InstanceLight *lamp, Sce Lamp *la = uid_lamp_map[lamp_uid]; Lamp *old_lamp = (Lamp *)ob->data; ob->data = la; - BKE_libblock_free_us(bmain, old_lamp); + BKE_id_free_us(bmain, old_lamp); return ob; } diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 069215da2b7..3cbb783fcad 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -1105,7 +1105,7 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta BKE_mesh_calc_normals(new_mesh); id_us_plus(&old_mesh->id); /* Because BKE_mesh_assign_object would have already decreased it... */ - BKE_libblock_free_us(m_bmain, old_mesh); + BKE_id_free_us(m_bmain, old_mesh); COLLADAFW::MaterialBindingArray& mat_array = geom->getMaterialBindings(); -- cgit v1.2.3