1 files changed, 36 insertions, 0 deletions

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 66647a994bc..0c0396ea758 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -57,6 +57,7 @@
 
 #include "BKE_anim.h"
 #include "BKE_animsys.h"
+#include "BKE_colortools.h"
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_group.h"
@@ -76,6 +77,8 @@
 
 #include "RE_engine.h"
 
+#include "IMB_colormanagement.h"
+
 //XXX #include "BIF_previewrender.h"
 //XXX #include "BIF_editseq.h"
 
@@ -169,6 +172,11 @@ Scene *BKE_scene_copy(Scene *sce, int type)
 			obase = obase->next;
 			base = base->next;
 		}
+
+		/* copy color management settings */
+		BKE_color_managed_display_settings_copy(&scen->display_settings, &sce->display_settings);
+		BKE_color_managed_view_settings_copy(&scen->view_settings, &sce->view_settings);
+		BKE_color_managed_view_settings_copy(&scen->r.im_format.view_settings, &sce->r.im_format.view_settings);
 	}
 
 	/* tool settings */
@@ -339,6 +347,8 @@ void BKE_scene_free(Scene *sce)
 		MEM_freeN(sce->fps_info);
 
 	sound_destroy_scene(sce);
+
+	BKE_color_managed_view_settings_free(&sce->view_settings);
 }
 
 Scene *BKE_scene_add(const char *name)
@@ -379,7 +389,14 @@ Scene *BKE_scene_add(const char *name)
 	sce->r.frs_sec_base = 1;
 	sce->r.edgeint = 10;
 	sce->r.ocres = 128;
+
+	/* OCIO_TODO: for forwards compatibiliy only, so if no tonecurve are used,
+	 *            images would look in the same way as in current blender
+	 *
+	 *            perhaps at some point should be completely deprecated?
+	 */
 	sce->r.color_mgt_flag |= R_COLOR_MANAGEMENT;
+
 	sce->r.gauss = 1.0;
 	
 	/* deprecated but keep for upwards compat */
@@ -553,6 +570,9 @@ Scene *BKE_scene_add(const char *name)
 
 	sound_create_scene(sce);
 
+	BKE_color_managed_display_settings_init(&sce->display_settings);
+	BKE_color_managed_view_settings_init(&sce->view_settings);
+
 	return sce;
 }
 
@@ -1248,3 +1268,19 @@ void BKE_scene_base_flag_from_objects(struct Scene *scene)
 		base = base->next;
 	}
 }
+
+void BKE_scene_disable_color_management(Scene *scene)
+{
+	ColorManagedDisplaySettings *display_settings = &scene->display_settings;
+	ColorManagedViewSettings *view_settings = &scene->view_settings;
+	const char *view;
+
+	/* NOTE: None display with Default view should always exist in OCIO configuration, otherwise it wouldn't work as expected */
+	BLI_strncpy(display_settings->display_device, "None", sizeof(display_settings->display_device));
+
+	view = IMB_colormanagement_view_get_default_name(display_settings->display_device);
+
+	if (view) {
+		BLI_strncpy(view_settings->view_transform, view, sizeof(view_settings->view_transform));
+	}
+}