[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40136] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: == Sequencer ==

[Peter Schlaile]

Revision: 40136
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40136
Author:   schlaile
Date:     2011-09-11 21:46:24 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
== Sequencer ==

Fixed silly bug, that activated proxies at the wrong time.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c  2011-09-11 
21:41:30 UTC (rev 40135)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c  2011-09-11 
21:46:24 UTC (rev 40136)
@@ -1260,7 +1260,7 @@
        size_flags = seq->strip->proxy->build_size_flags;
 
        /* only use proxies, if they are enabled (even if present!) */
-       if (psize != IMB_PROXY_NONE && ((size_flags & psize) != psize)) {
+       if (psize == IMB_PROXY_NONE || ((size_flags & psize) != psize)) {
                return NULL;
        }
 

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