diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 20:13:42 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 22:30:02 +0300 |
| commit | 2ec17e655c4fdabc6251b5c81f4404451160923c (patch) | |
| tree | e733b30bb19cfc0037ffae8a01bac3c57334ebac /source/blender/blenkernel/intern/camera.c | |
| parent | 439ccca1e0b7078f3055ec14a7c81e964594ae6b (diff) | |
Use new generic BKE_id_expand_local() for both make_local() and copy() functions of obdata
(armature, mesh, curve, mball, lattice, lamp, camera, and speaker).
This greatly simplifies said code, once again no change expected from user PoV.
Diffstat (limited to 'source/blender/blenkernel/intern/camera.c')
| -rw-r--r-- | source/blender/blenkernel/intern/camera.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 8336c1fb3fb..8ae714d6d94 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -99,7 +99,7 @@ Camera *BKE_camera_copy(Main *bmain, Camera *cam) camn = BKE_libblock_copy(bmain, &cam->id); - id_lib_extern((ID *)camn->dof_ob); + BKE_id_expand_local(&camn->id, true); if (ID_IS_LINKED_DATABLOCK(cam)) { BKE_id_lib_local_paths(bmain, cam->id.lib, &camn->id); @@ -126,6 +126,7 @@ void BKE_camera_make_local(Main *bmain, Camera *cam) if (is_local) { if (!is_lib) { id_clear_lib_data(bmain, &cam->id); + BKE_id_expand_local(&cam->id, false); } else { Camera *cam_new = BKE_camera_copy(bmain, cam); |