[Bf-blender-cvs] [988fc249305] master: Fix T93500: Sequence.fps returns 0 when proxy is used

Richard Antalik noreply at git.blender.org
Mon Jun 13 20:46:54 CEST 2022


Commit: 988fc2493052adfe84e492776370132ff098c358
Author: Richard Antalik
Date:   Mon Jun 13 20:40:46 2022 +0200
Branches: master
https://developer.blender.org/rB988fc2493052adfe84e492776370132ff098c358

Fix T93500: Sequence.fps returns 0 when proxy is used

Caused by `seq_open_anim_file` early returning if anim struct exists,
exen if it's not initialized. To ensure `anim` struct is initialized
when `openfile` argument is true, don't do early return.

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

M	source/blender/sequencer/intern/utils.c

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

diff --git a/source/blender/sequencer/intern/utils.c b/source/blender/sequencer/intern/utils.c
index 260f82310fb..3cfe63e284f 100644
--- a/source/blender/sequencer/intern/utils.c
+++ b/source/blender/sequencer/intern/utils.c
@@ -217,7 +217,7 @@ void seq_open_anim_file(Scene *scene, Sequence *seq, bool openfile)
   const bool is_multiview = (seq->flag & SEQ_USE_VIEWS) != 0 &&
                             (scene->r.scemode & R_MULTIVIEW) != 0;
 
-  if ((seq->anims.first != NULL) && (((StripAnim *)seq->anims.first)->anim != NULL)) {
+  if ((seq->anims.first != NULL) && (((StripAnim *)seq->anims.first)->anim != NULL) && !openfile) {
     return;
   }



More information about the Bf-blender-cvs mailing list