[Bf-blender-cvs] [8928d99270f] blender-v2.79a-release: VSE: skip non image/movie w/ proxy dir storage
Campbell Barton
noreply at git.blender.org
Wed Feb 21 11:38:15 CET 2018
Commit: 8928d99270ff0dcafe23605221f271308e33f297
Author: Campbell Barton
Date: Wed Feb 21 18:13:40 2018 +1100
Branches: blender-v2.79a-release
https://developer.blender.org/rB8928d99270ff0dcafe23605221f271308e33f297
VSE: skip non image/movie w/ proxy dir storage
This would use uninitialized filename variable,
looked into supporting this however generating proxies currently only
works for movies.
===================================================================
M source/blender/blenkernel/intern/sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index c8767e518f2..ab989cdcf32 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1673,6 +1673,11 @@ static bool seq_proxy_get_fname(Editing *ed, Sequence *seq, int cfra, int render
else if (seq->type == SEQ_TYPE_IMAGE) {
fname[0] = 0;
}
+ else {
+ /* We could make a name here, except non-movie's don't generate proxies,
+ * cancel until other types of sequence strips are supported. */
+ return false;
+ }
BLI_path_append(dir, sizeof(dir), fname);
BLI_path_abs(name, G.main->name);
}
More information about the Bf-blender-cvs
mailing list