diff options
author | Sv. Lockal <lockalsash@gmail.com> | 2013-08-05 23:16:52 +0400 |
---|---|---|
committer | Sv. Lockal <lockalsash@gmail.com> | 2013-08-05 23:16:52 +0400 |
commit | b438c2840cbf533830ecb29b1ef65325d3f77f73 (patch) | |
tree | 619cf52e827b0b2db0b8c5db605eaa96d0574e71 /source/blender/compositor/intern | |
parent | f4e4e2594ce945b8ff900d4713cf7adcfa2d41d2 (diff) |
SplitViewer node:
- fix thumbnail preview (previously it showed only one input)
- make SplitViewer node update even if the second input is not connected
- now it works when the first socket is connected to a zero-sized node tree (e. g. Color Input node)
- SplitViewer node is now based on 2 operations: SplitOperation and ViewerOperation.
- ViewerBaseOperation was removed as a redundant one. Any future viewer style node can use the same principle and prepare the output before passing to an actual ViewerOperation.
Thanks Lukas Toenne for reviewing this patch and giving me get few pieces of advice.
Diffstat (limited to 'source/blender/compositor/intern')
-rw-r--r-- | source/blender/compositor/intern/COM_ExecutionGroup.cpp | 2 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index 51eaffaa31c..827b93c350e 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -248,7 +248,7 @@ void ExecutionGroup::execute(ExecutionSystem *graph) OrderOfChunks chunkorder = COM_ORDER_OF_CHUNKS_DEFAULT; if (operation->isViewerOperation()) { - ViewerBaseOperation *viewer = (ViewerBaseOperation *)operation; + ViewerOperation *viewer = (ViewerOperation *)operation; centerX = viewer->getCenterX(); centerY = viewer->getCenterY(); chunkorder = viewer->getChunkOrder(); diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp index 9f0a943c8a2..9024cd33745 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp +++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp @@ -36,7 +36,7 @@ #include "COM_GroupNode.h" #include "COM_WriteBufferOperation.h" #include "COM_ReadBufferOperation.h" -#include "COM_ViewerBaseOperation.h" +#include "COM_ViewerOperation.h" extern "C" { #include "BKE_node.h" @@ -212,7 +212,7 @@ void ExecutionSystemHelper::debugDump(ExecutionSystem *system) printf("|"); } if (operation->isViewerOperation()) { - ViewerBaseOperation *viewer = (ViewerBaseOperation *)operation; + ViewerOperation *viewer = (ViewerOperation *)operation; if (viewer->isActiveViewerOutput()) { printf("Active viewer"); } |