diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-10 15:52:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-10 15:52:00 +0300 |
| commit | 87b974caa1e2b780c8031d67a42488039036c489 (patch) | |
| tree | 6776b8d35f25b2c458f90e0ba4cfa497782ebc30 /source/blender/blenkernel/intern/camera.c | |
| parent | ae2033aca2047afbfe0bf449bcd01b5b79a124b8 (diff) | |
Cleanup/Refactor: pass Main pointer to all ID copy functions.
Also allows us to get rid of a few _copy_ex() versions...
Diffstat (limited to 'source/blender/blenkernel/intern/camera.c')
| -rw-r--r-- | source/blender/blenkernel/intern/camera.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 9fd2c2ddd14..41c67ef5365 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -91,16 +91,16 @@ void *BKE_camera_add(Main *bmain, const char *name) return cam; } -Camera *BKE_camera_copy(Camera *cam) +Camera *BKE_camera_copy(Main *bmain, Camera *cam) { Camera *camn; - camn = BKE_libblock_copy(&cam->id); + camn = BKE_libblock_copy(bmain, &cam->id); id_lib_extern((ID *)camn->dof_ob); if (ID_IS_LINKED_DATABLOCK(cam)) { - BKE_id_lib_local_paths(G.main, cam->id.lib, &camn->id); + BKE_id_lib_local_paths(bmain, cam->id.lib, &camn->id); } return camn; @@ -134,7 +134,7 @@ void BKE_camera_make_local(Camera *cam) id_clear_lib_data(bmain, &cam->id); } else if (is_local && is_lib) { - Camera *cam_new = BKE_camera_copy(cam); + Camera *cam_new = BKE_camera_copy(bmain, cam); cam_new->id.us = 0; |