== Sequencer ==
authorPeter Schlaile <peter@schlaile.de>
Sun, 14 Jun 2009 20:52:43 +0000 (20:52 +0000)
committerPeter Schlaile <peter@schlaile.de>
Sun, 14 Jun 2009 20:52:43 +0000 (20:52 +0000)
Fixes an irritating but harmless error message when using custom proxy files.

source/blender/src/buttons_scene.c

index d0df532a8248a32ceedbee01cca2b8fd0901dbc3..dac093b6ba86ff4022a86d71d08f3f859ad123a2 100644 (file)
@@ -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 ",