blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Refactor: Move camera foreach_id to new IDTypeInfo structure.

This commit is contained in:
Bastien Montagne 2020-05-13 19:01:20 +02:00
parent c9048441f5
commit 9ac5413ac0
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@
#include "BKE_idtype.h"
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_object.h"
#include "BKE_scene.h"
@ -95,6 +96,21 @@ static void camera_free_data(ID *id)
BLI_freelistN(&cam->bg_images);
}
static void camera_foreach_id(ID *id, LibraryForeachIDData *data)
{
Camera *camera = (Camera *)id;
BKE_LIB_FOREACHID_PROCESS(data, camera->dof.focus_object, IDWALK_CB_NOP);
LISTBASE_FOREACH (CameraBGImage *, bgpic, &camera->bg_images) {
if (bgpic->source == CAM_BGIMG_SOURCE_IMAGE) {
BKE_LIB_FOREACHID_PROCESS(data, bgpic->ima, IDWALK_CB_USER);
}
else if (bgpic->source == CAM_BGIMG_SOURCE_MOVIE) {
BKE_LIB_FOREACHID_PROCESS(data, bgpic->clip, IDWALK_CB_USER);
}
}
}
IDTypeInfo IDType_ID_CA = {
.id_code = ID_CA,
.id_filter = FILTER_ID_CA,
@ -109,6 +125,7 @@ IDTypeInfo IDType_ID_CA = {
.copy_data = camera_copy_data,
.free_data = camera_free_data,
.make_local = camera_make_local,
.foreach_id = camera_foreach_id,
};
/******************************** Camera Usage *******************************/

13
source/blender/blenkernel/intern/lib_query.c
View File

@ -925,22 +925,11 @@ static void library_foreach_ID_link(Main *bmain,
}
case ID_LA: {
BLI_assert(0);
break;
}
case ID_CA: {
Camera *camera = (Camera *)id;
CALLBACK_INVOKE(camera->dof.focus_object, IDWALK_CB_NOP);
LISTBASE_FOREACH (CameraBGImage *, bgpic, &camera->bg_images) {
if (bgpic->source == CAM_BGIMG_SOURCE_IMAGE) {
CALLBACK_INVOKE(bgpic->ima, IDWALK_CB_USER);
}
else if (bgpic->source == CAM_BGIMG_SOURCE_MOVIE) {
CALLBACK_INVOKE(bgpic->clip, IDWALK_CB_USER);
}
}
BLI_assert(0);
break;
}