Commit: 34818a44b282f44e22205507dabee1e37c6312ab
Author: Antony Riakiotakis
Date: Tue Apr 7 12:15:02 2015 +0200
Branches: master
https://developer.blender.org/rB34818a44b282f44e22205507dabee1e37c6312ab
Make image strips also follow the project directory storage options.
===================================================================
M source/blender/blenkernel/intern/sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index 8c803f8..4cea8aa 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1581,13 +1581,19 @@ static bool seq_proxy_get_fname(Editing *ed, Sequence
*seq, int cfra, int render
sanim = BLI_findlink(&seq->anims, view_id);
- if (sanim && sanim->anim && ed->proxy_storage ==
SEQ_EDIT_PROXY_DIR_STORAGE) {
+ if (ed->proxy_storage == SEQ_EDIT_PROXY_DIR_STORAGE) {
char fname[FILE_MAXFILE];
if (ed->proxy_dir[0] == 0)
BLI_strncpy(dir, "//BL_proxy", sizeof(dir));
else
BLI_strncpy(dir, ed->proxy_dir, sizeof(dir));
- IMB_anim_get_fname(sanim->anim, fname, FILE_MAXFILE);
+
+ if (sanim && sanim->anim) {
+ IMB_anim_get_fname(sanim->anim, fname, FILE_MAXFILE);
+ }
+ else if (seq->type == SEQ_TYPE_IMAGE) {
+ fname[0] = 0;
+ }
BLI_path_append(dir, sizeof(dir), fname);
BLI_path_abs(name, G.main->name);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
