blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Refactor: move color settings .blend I/O to blenkernel 

Ref T76372.
This commit is contained in:
Jacques Lucke 2020-11-06 14:05:09 +01:00
parent 8d5073345d
commit 62223e9851
Notes: blender-bot 2023-02-14 08:49:53 +01:00 
Referenced by issue #76372, Blenloader Decentralization
4 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/BKE_colortools.h
View File

@ -139,6 +139,11 @@ void BKE_color_managed_view_settings_copy(struct ColorManagedViewSettings *new_s
const struct ColorManagedViewSettings *settings);
void BKE_color_managed_view_settings_free(struct ColorManagedViewSettings *settings);
void BKE_color_managed_view_settings_blend_write(struct BlendWriter *writer,
struct ColorManagedViewSettings *settings);
void BKE_color_managed_view_settings_blend_read_data(struct BlendDataReader *reader,
struct ColorManagedViewSettings *settings);
void BKE_color_managed_colorspace_settings_init(
struct ColorManagedColorspaceSettings *colorspace_settings);
void BKE_color_managed_colorspace_settings_copy(

18
source/blender/blenkernel/intern/colortools.c
View File

@ -1819,6 +1819,24 @@ void BKE_color_managed_view_settings_free(ColorManagedViewSettings *settings)
}
}
void BKE_color_managed_view_settings_blend_write(BlendWriter *writer,
ColorManagedViewSettings *settings)
{
if (settings->curve_mapping) {
BKE_curvemapping_blend_write(writer, settings->curve_mapping);
}
}
void BKE_color_managed_view_settings_blend_read_data(BlendDataReader *reader,
ColorManagedViewSettings *settings)
{
BLO_read_data_address(reader, &settings->curve_mapping);
if (settings->curve_mapping) {
BKE_curvemapping_blend_read(reader, settings->curve_mapping);
}
}
void BKE_color_managed_colorspace_settings_init(
ColorManagedColorspaceSettings *colorspace_settings)
{

12
source/blender/blenloader/intern/readfile.c
View File

@ -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;

9
source/blender/blenloader/intern/writefile.c
View File

@ -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) {