diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2019-05-02 16:01:00 +0300 |
|---|---|---|
| committer | Alexander Gavrilov <angavrilov@gmail.com> | 2019-05-02 16:31:11 +0300 |
| commit | 2c5ee7418c26bb4e756e1fb58508775d25550d08 (patch) | |
| tree | 5d960c78ba60e200bc1f587974d8192d4d65ebc1 /source/blender/blenloader | |
| parent | 5ec79879491331c499642ea6635a4bd456b84460 (diff) | |
Fix T63697: correct stuck R_NO_CAMERA_SWITCH in scene->r.mode.
This flag becomes stuck in certain situations, causing the marker
camera switch feature to not work.
To fix old files with the problem, clear the flag on file load.
Also, the line that is supposed to clear it has wrong bit math,
causing seq_render_scene_strip to effectively toggle the flag on or
off every time it's run, instead of restoring to original state.
The flag and code were added in 001789d7337a by @campbellbarton.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index bf96cc9fa8e..7f62369647a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6867,6 +6867,11 @@ static void direct_link_scene(FileData *fd, Scene *sce) } } +#ifdef DURIAN_CAMERA_SWITCH + /* Runtime */ + sce->r.mode &= ~R_NO_CAMERA_SWITCH; +#endif + sce->r.avicodecdata = newdataadr(fd, sce->r.avicodecdata); if (sce->r.avicodecdata) { sce->r.avicodecdata->lpFormat = newdataadr(fd, sce->r.avicodecdata->lpFormat); |