diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-19 10:36:14 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-19 10:36:14 +0300 |
| commit | 1f46da922a98c6badf6e2de13304358b3b0b7576 (patch) | |
| tree | b4e6a47524627ad6f7a925876eecbccf9cf542b6 /source/blender/blenloader | |
| parent | f95828a0182acb7c1ba0fa8afccd6acdf23bc5c2 (diff) | |
| parent | 4a04d7ae8930502037cd23dc94ed1bc9bc0043ac (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/mask/mask_draw.c
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_270.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index a097e0a9e48..d8f1da3b6b4 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1636,6 +1636,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) } { + for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { + if (scene->r.im_format.exr_codec == R_IMF_EXR_CODEC_DWAB) { + scene->r.im_format.exr_codec = R_IMF_EXR_CODEC_DWAA; + } + } + if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) { bScreen *screen; |