Revision: 28130
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28130
Author: schlaile
Date: 2010-04-11 21:26:46 +0200 (Sun, 11 Apr 2010)
Log Message:
-----------
== Sequencer ==
Made custom proxy files a lot more sensible to select
(upgraded to filepath get/setters)
Changed semantics, since custom files don't make much
sense without custom directories...
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py 2010-04-11 18:37:49 UTC
(rev 28129)
+++ trunk/blender/release/scripts/ui/space_sequencer.py 2010-04-11 19:26:46 UTC
(rev 28130)
@@ -727,9 +727,12 @@
flow = layout.column_flow()
flow.prop(strip, "proxy_custom_directory")
+ flow.prop(strip, "proxy_custom_file")
if strip.proxy: # TODO - need to add this somehow
- flow.prop(strip.proxy, "directory")
- flow.prop(strip.proxy, "file")
+ if strip.proxy_custom_directory and not strip.proxy_custom_file:
+ flow.prop(strip.proxy, "directory")
+ if strip.proxy_custom_file:
+ flow.prop(strip.proxy, "filepath")
class SEQUENCER_PT_view(SequencerButtonsPanel_Output):
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-04-11
18:37:49 UTC (rev 28129)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-04-11
19:26:46 UTC (rev 28130)
@@ -1231,7 +1231,8 @@
return FALSE;
}
- if (seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) {
+ if ((seq->flag & SEQ_USE_PROXY_CUSTOM_DIR)
+ || (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE)) {
strcpy(dir, seq->strip->proxy->dir);
} else {
if (seq->type == SEQ_IMAGE || seq->type == SEQ_MOVIE) {
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-04-11
18:37:49 UTC (rev 28129)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-04-11
19:26:46 UTC (rev 28130)
@@ -9646,6 +9646,17 @@
BLI_path_abs(str, G.sce);
seq->sound =
sound_new_file(main, str);
}
+ /* don't know, if anybody used that
+ this way, but just in case, upgrade
+ to new way... */
+ if((seq->flag &
SEQ_USE_PROXY_CUSTOM_FILE) &&
+ !(seq->flag &
SEQ_USE_PROXY_CUSTOM_DIR))
+ {
+
+
snprintf(seq->strip->proxy->dir,
+ FILE_MAXDIR,
"%s/BL_proxy",
+ seq->strip->dir);
+ }
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
