[Bf-blender-cvs] [39b1e66afd9] blender2.8: Defaults: disable AV Sync by default again, it breaks physics caching.

Brecht Van Lommel noreply at git.blender.org
Tue Nov 6 17:52:56 CET 2018


Commit: 39b1e66afd9132031aad2f20e236f631264db50a
Author: Brecht Van Lommel
Date:   Tue Nov 6 16:55:48 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB39b1e66afd9132031aad2f20e236f631264db50a

Defaults: disable AV Sync by default again, it breaks physics caching.

This reverts back to the 2.79 situation. The better solution would be to make
physics caching somehow simulate the skipped frames. But for now the more
important thing is to have working physics.

Ref T54943, T56352.

===================================================================

M	source/blender/blenloader/intern/versioning_defaults.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 5e475b9a9e4..533623039fa 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -207,6 +207,12 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
 			scene->r.cfra = 1.0f;
 			scene->r.displaymode = R_OUTPUT_WINDOW;
 
+			/* AV Sync break physics sim caching, disable until that is fixed. */
+			if (!(app_template && STREQ(app_template, "Video_Editing"))) {
+				scene->audio.flag &= ~AUDIO_SYNC;
+				scene->flag &= ~SCE_FRAME_DROP;
+			}
+
 			/* Don't enable compositing nodes. */
 			if (scene->nodetree) {
 				ntreeFreeTree(scene->nodetree);



More information about the Bf-blender-cvs mailing list