diff options
author | Jacques Lucke <jacques@blender.org> | 2020-09-10 18:47:04 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-09-10 18:47:04 +0300 |
commit | e628e8821e7c81b912968c28e1972afe7078343a (patch) | |
tree | 4456a22454b92ab9d2f1c52cea440207ff307e12 /source/blender/blenloader/intern/readfile.c | |
parent | 133b7c34dd1c457ee921302e88594654ac64ba9f (diff) |
Refactor: move LightProbe .blend I/O to IDTypeInfo callbacks
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e30df56c2ec..9b8564cf817 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6373,23 +6373,6 @@ static void fix_relpaths_library(const char *basepath, Main *main) /** \} */ /* -------------------------------------------------------------------- */ -/** \name Read ID: Light Probe - * \{ */ - -static void lib_link_lightprobe(BlendLibReader *reader, LightProbe *prb) -{ - BLO_read_id_address(reader, prb->id.lib, &prb->visibility_grp); -} - -static void direct_link_lightprobe(BlendDataReader *reader, LightProbe *prb) -{ - BLO_read_data_address(reader, &prb->adt); - BKE_animdata_blend_read_data(reader, prb->adt); -} - -/** \} */ - -/* -------------------------------------------------------------------- */ /** \name Read ID: Sound * \{ */ @@ -6715,9 +6698,6 @@ static bool direct_link_id(FileData *fd, Main *main, const int tag, ID *id, ID * case ID_SO: direct_link_sound(&reader, (bSound *)id); break; - case ID_LP: - direct_link_lightprobe(&reader, (LightProbe *)id); - break; case ID_GR: direct_link_collection(&reader, (Collection *)id); break; @@ -6766,6 +6746,7 @@ static bool direct_link_id(FileData *fd, Main *main, const int tag, ID *id, ID * case ID_MSK: case ID_SPK: case ID_AR: + case ID_LP: /* Do nothing. Handled by IDTypeInfo callback. */ break; } @@ -7389,9 +7370,6 @@ static void lib_link_all(FileData *fd, Main *bmain) * 3D viewport may contains pointers to other ID data (like bgpic)! See T41411. */ lib_link_screen(&reader, (bScreen *)id); break; - case ID_LP: - lib_link_lightprobe(&reader, (LightProbe *)id); - break; case ID_PA: lib_link_particlesettings(&reader, (ParticleSettings *)id); break; @@ -7453,6 +7431,7 @@ static void lib_link_all(FileData *fd, Main *bmain) case ID_MSK: case ID_SPK: case ID_AR: + case ID_LP: /* Do nothing. Handled by IDTypeInfo callback. */ break; } @@ -8400,10 +8379,6 @@ static void expand_sound(BlendExpander *expander, bSound *snd) BLO_expand(expander, snd->ipo); // XXX deprecated - old animation system } -static void expand_lightprobe(BlendExpander *UNUSED(expander), LightProbe *UNUSED(prb)) -{ -} - static void expand_gpencil(BlendExpander *expander, bGPdata *gpd) { LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) { @@ -8508,9 +8483,6 @@ void BLO_expand_main(void *fdhandle, Main *mainvar) case ID_SO: expand_sound(&expander, (bSound *)id); break; - case ID_LP: - expand_lightprobe(&expander, (LightProbe *)id); - break; case ID_GR: expand_collection(&expander, (Collection *)id); break; |