diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-11 18:49:29 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-11 19:08:30 +0300 |
| commit | 1bc8ddbc6ce4c80919640aee9a29da63d8f6b442 (patch) | |
| tree | 21b6ac87f820be6da306ba96b94e5d3b3d511e01 /source/blender/blenkernel/intern/scene.c | |
| parent | 19af5bd57e930cc9a2bf73ac9010425338437faf (diff) | |
Fix T62310: Batch generate data-block previews broken.
Some uninitialized colormanagement data was breaking RNA acces for them,
exposed in batch preview management when generating previews for scenes
because we have to backup/restore scene and all its settings
before/after rendering it...
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index abe0393f582..580d99e9042 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -780,6 +780,18 @@ void BKE_scene_init(Scene *sce) BLI_strncpy(sce->sequencer_colorspace_settings.name, colorspace_name, sizeof(sce->sequencer_colorspace_settings.name)); + /* Those next two sets (render and baking settings) are not currently in use, + * but are exposed to RNA API and hence must have valid data. */ + BKE_color_managed_display_settings_init(&sce->r.im_format.display_settings); + BKE_color_managed_view_settings_init_render(&sce->r.im_format.view_settings, + &sce->r.im_format.display_settings, + "Filmic"); + + BKE_color_managed_display_settings_init(&sce->r.bake.im_format.display_settings); + BKE_color_managed_view_settings_init_render(&sce->r.bake.im_format.view_settings, + &sce->r.bake.im_format.display_settings, + "Filmic"); + /* Safe Areas */ copy_v2_fl2(sce->safe_areas.title, 10.0f / 100.0f, 5.0f / 100.0f); copy_v2_fl2(sce->safe_areas.action, 3.5f / 100.0f, 3.5f / 100.0f); |