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:
authorCampbell Barton <ideasman42@gmail.com>2012-09-06 06:20:03 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-06 06:20:03 +0400
commit04b5ef20f138412701c807b1c3f151c2a69cad82 (patch)
tree8686472abc2989fd37be9e03667912799700cc3f /source/blender/compositor
parent47ec91e8d343c77e494a334ca8054c6d3538d893 (diff)
style cleanup: indentation
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/intern/COM_Converter.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp
index d4fad80ed07..71067ac8f15 100644
--- a/source/blender/compositor/intern/COM_Converter.cpp
+++ b/source/blender/compositor/intern/COM_Converter.cpp
@@ -500,7 +500,8 @@ void Converter::convertResolution(SocketConnection *connection, ExecutionSystem
system->addOperation(sxop);
system->addOperation(syop);
- unsigned int resolution[2] = {fromWidth, fromHeight};
+ unsigned int resolution[2] = {fromOperation->getWidth(),
+ fromOperation->getHeight()};
scaleOperation->setResolution(resolution);
sxop->setResolution(resolution);
syop->setResolution(resolution);
@@ -522,7 +523,8 @@ void Converter::convertResolution(SocketConnection *connection, ExecutionSystem
system->addOperation(xop);
system->addOperation(yop);
- unsigned int resolution[2] = {toWidth, toHeight};
+ unsigned int resolution[2] = {toOperation->getWidth(),
+ toOperation->getHeight()};
translateOperation->setResolution(resolution);
xop->setResolution(resolution);
yop->setResolution(resolution);