blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: Do not mix IDTypeInfo code with rest of an ID type specific API...

This commit is contained in:
Bastien Montagne 2020-05-13 18:54:13 +02:00
parent 91ecab5000
commit c9048441f5
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/blender/blenkernel/intern/camera.c
View File

@ -63,17 +63,6 @@ static void camera_init_data(ID *id)
MEMCPY_STRUCT_AFTER(cam, DNA_struct_default_get(Camera), id);
}
void *BKE_camera_add(Main *bmain, const char *name)
{
Camera *cam;
cam = BKE_libblock_alloc(bmain, ID_CA, name, 0);
camera_init_data(&cam->id);
return cam;
}
/**
* Only copy internal data of Camera ID from source
* to already allocated/initialized destination.
@ -94,13 +83,6 @@ static void camera_copy_data(Main *UNUSED(bmain),
BLI_duplicatelist(&cam_dst->bg_images, &cam_src->bg_images);
}
Camera *BKE_camera_copy(Main *bmain, const Camera *cam)
{
Camera *cam_copy;
BKE_id_copy(bmain, &cam->id, (ID **)&cam_copy);
return cam_copy;
}
static void camera_make_local(Main *bmain, ID *id, const int flags)
{
BKE_lib_id_make_local_generic(bmain, id, flags);
@ -131,6 +113,24 @@ IDTypeInfo IDType_ID_CA = {
/******************************** Camera Usage *******************************/
void *BKE_camera_add(Main *bmain, const char *name)
{
Camera *cam;
cam = BKE_libblock_alloc(bmain, ID_CA, name, 0);
camera_init_data(&cam->id);
return cam;
}
Camera *BKE_camera_copy(Main *bmain, const Camera *cam)
{
Camera *cam_copy;
BKE_id_copy(bmain, &cam->id, (ID **)&cam_copy);
return cam_copy;
}
/* get the camera's dof value, takes the dof object into account */
float BKE_camera_object_dof_distance(Object *ob)
{