diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-09 16:44:28 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-09 16:44:28 +0300 |
| commit | c1a2f973daafa403664353526b8cf3c59cccf24c (patch) | |
| tree | ca37df851280c88ba533ada38085c875ee049099 /source/blender/blenloader/intern/versioning_270.c | |
| parent | d533b70b234d6a6cb7a44a556fcbf3fc68f67085 (diff) | |
| parent | 7e39d151d850590fbabc9870bc5134d9421c5c2c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/intern/versioning_270.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_270.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index bd4e4c2e35c..7228c3522f0 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1817,6 +1817,23 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) } } } + + for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { + int preset = scene->r.ffcodecdata.ffmpeg_preset; + if (preset == FFM_PRESET_NONE || preset >= FFM_PRESET_GOOD) { + continue; + } + if (preset <= FFM_PRESET_FAST) { + preset = FFM_PRESET_REALTIME; + } + else if (preset >= FFM_PRESET_SLOW) { + preset = FFM_PRESET_BEST; + } + else { + preset = FFM_PRESET_GOOD; + } + scene->r.ffcodecdata.ffmpeg_preset = preset; + } } } |