diff options
author | Jacques Lucke <jacques@blender.org> | 2020-11-06 16:05:09 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-11-06 16:10:31 +0300 |
commit | 62223e98510f2c0d735cb7084134c5213c1cb804 (patch) | |
tree | c1b06dcd4b42582a6ddc2ae4328d63ad5b819d70 /source/blender/blenloader | |
parent | 8d5073345d7e3f66d08e2f5587c8ad8cc1d812fa (diff) |
Refactor: move color settings .blend I/O to blenkernel
Ref T76372.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 12 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 9 |
2 files changed, 2 insertions, 19 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index fcf839f8751..187ecd74739 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3842,16 +3842,6 @@ static void direct_link_object(BlendDataReader *reader, Object *ob) BKE_previewimg_blend_read(reader, ob->preview); } -static void direct_link_view_settings(BlendDataReader *reader, - ColorManagedViewSettings *view_settings) -{ - BLO_read_data_address(reader, &view_settings->curve_mapping); - - if (view_settings->curve_mapping) { - BKE_curvemapping_blend_read(reader, view_settings->curve_mapping); - } -} - /** \} */ /* -------------------------------------------------------------------- */ @@ -4402,7 +4392,7 @@ static void direct_link_scene(BlendDataReader *reader, Scene *sce) BLO_read_list(reader, &(srl->freestyleConfig.linesets)); } - direct_link_view_settings(reader, &sce->view_settings); + BKE_color_managed_view_settings_blend_read_data(reader, &sce->view_settings); BLO_read_data_address(reader, &sce->rigidbody_world); RigidBodyWorld *rbw = sce->rigidbody_world; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index f5b588883b3..e9cb115a2c5 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1317,13 +1317,6 @@ static void write_sequence_modifiers(BlendWriter *writer, ListBase *modbase) } } -static void write_view_settings(BlendWriter *writer, ColorManagedViewSettings *view_settings) -{ - if (view_settings->curve_mapping) { - BKE_curvemapping_blend_write(writer, view_settings->curve_mapping); - } -} - static void write_scene(BlendWriter *writer, Scene *sce, const void *id_address) { if (BLO_write_is_undo(writer)) { @@ -1521,7 +1514,7 @@ static void write_scene(BlendWriter *writer, Scene *sce, const void *id_address) ntreeBlendWrite(writer, sce->nodetree); } - write_view_settings(writer, &sce->view_settings); + BKE_color_managed_view_settings_blend_write(writer, &sce->view_settings); /* writing RigidBodyWorld data to the blend file */ if (sce->rigidbody_world) { |