diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-06-12 08:23:21 +0400 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-06-12 08:23:21 +0400 |
| commit | ac5a735e3fe9fe29e38e3a20c20da87b27feb112 (patch) | |
| tree | 52059f3dbc9827eb498abe772e763e541b3b3608 /source/blender/compositor/intern/COM_OutputSocket.cpp | |
| parent | 7977078227d6da77e294dd860f4685387f0bae56 (diff) | |
* FIX for
- [#31777] Border Crop gives black
- [#31768] Crash when connecting a Math node to a translate node in Tiles comp
- [#31638] View node in new node compo system crashes when inside a group
* make sure a very fast vignette can be made by using a EliipseMask + Fast Gaussian blur
Diffstat (limited to 'source/blender/compositor/intern/COM_OutputSocket.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_OutputSocket.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_OutputSocket.cpp b/source/blender/compositor/intern/COM_OutputSocket.cpp index 00d3518cd15..708b2d65d46 100644 --- a/source/blender/compositor/intern/COM_OutputSocket.cpp +++ b/source/blender/compositor/intern/COM_OutputSocket.cpp @@ -47,8 +47,13 @@ void OutputSocket::determineResolution(unsigned int resolution[], unsigned int p NodeBase *node = this->getNode(); if (node->isOperation()) { NodeOperation *operation = (NodeOperation*)node; - operation->determineResolution(resolution, preferredResolution); - operation->setResolution(resolution); + if (operation->isResolutionSet()) { + resolution[0] = operation->getWidth(); + resolution[1] = operation->getHeight(); + } else { + operation->determineResolution(resolution, preferredResolution); + operation->setResolution(resolution); + } } } |