diff options
| author | Peter Schlaile <peter@schlaile.de> | 2009-06-15 00:52:43 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2009-06-15 00:52:43 +0400 |
| commit | afaa3768e655bb7cfc7f89fd5fdd08a69ac4f132 (patch) | |
| tree | 80cc217fb45426f270c38bc08599f97b5cde0ff2 /source/blender | |
| parent | bc6761f5ef9e4201a0f34531f9855fce2be68c5e (diff) | |
== Sequencer ==
Fixes an irritating but harmless error message when using custom proxy files.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/src/buttons_scene.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index d0df532a824..dac093b6ba8 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1266,7 +1266,8 @@ static void seq_panel_proxy() if (last_seq->type != SEQ_MOVIE && last_seq->type != SEQ_IMAGE - && !(last_seq->flag & SEQ_USE_PROXY_CUSTOM_DIR)) { + && !(last_seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) + && !(last_seq->flag & SEQ_USE_PROXY_CUSTOM_FILE)) { yofs -= 20; uiDefBut(block, LABEL, 0, "Cannot proxy this strip without ", |