Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Toenne <lukas.toenne@googlemail.com>2012-06-18 20:23:16 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2012-06-18 20:23:16 +0400
commit0d896078990dca8ccf725304252fe0f6a6b8d745 (patch)
tree96c3d1a256f18fb563c24ffeb4b7cb8ba4f51955 /source/blender/compositor
parent4b877e1f8b645fbb57bbe66ff80903ff59395fda (diff)
Fix #31740, compositor overwrites images on frame scrubbing. Restored old compositor behavior which only saves images when doing an actual rendering (this was not implemented in Tile yet).
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/nodes/COM_OutputFileNode.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cpp b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
index 402529b9186..db7fbffea4f 100644
--- a/source/blender/compositor/nodes/COM_OutputFileNode.cpp
+++ b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
@@ -37,9 +37,11 @@ void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorConte
NodeImageMultiFile *storage = (NodeImageMultiFile *)this->getbNode()->storage;
if (!context->isRendering()) {
- /* XXX TODO as in previous implementation?
- * add dummy operations and exit, to prevent file writing on each compo update.
+ /* only output files when rendering a sequence -
+ * otherwise, it overwrites the output files just
+ * scrubbing through the timeline when the compositor updates.
*/
+ return;
}
if (storage->format.imtype == R_IMF_IMTYPE_MULTILAYER) {