[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20885] trunk/blender/source/blender/src/ buttons_scene.c: == Sequencer ==

[Peter Schlaile]

Revision: 20885
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20885
Author:   schlaile
Date:     2009-06-14 22:52:43 +0200 (Sun, 14 Jun 2009)

Log Message:
-----------
== Sequencer ==

Fixes an irritating but harmless error message when using custom proxy files.

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_scene.c

Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c    2009-06-14 20:26:20 UTC 
(rev 20884)
+++ trunk/blender/source/blender/src/buttons_scene.c    2009-06-14 20:52:43 UTC 
(rev 20885)
@@ -1266,7 +1266,8 @@
 
        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 ",


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs