From 84a87bf45a21d758f5c5c6c31ee259cecb95209e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 20 Jul 2017 15:00:09 +0200 Subject: Depsgraph: Fix crashes when OCIO configuration is missing We were creating copy on write version of scene prior to validating color management settings for the original scene. --- source/blender/blenkernel/intern/blendfile.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/blendfile.c') diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 6ac41c72815..4de2433a89a 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -332,11 +332,20 @@ static void setup_app_data( } } } + + /* Setting scene might require having a dependency graph, with copy on write + * we need to make sure we ensure scene has correct color management before + * constructing dependency graph. + */ + if (mode != LOAD_UNDO) { + IMB_colormanagement_check_file_config(G.main); + } + BKE_scene_set_background(G.main, curscene); if (mode != LOAD_UNDO) { + /* TODO(sergey): Can this be also move above? */ RE_FreeAllPersistentData(); - IMB_colormanagement_check_file_config(G.main); } MEM_freeN(bfd); -- cgit v1.2.3