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-08-04 16:30:16 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-04 16:30:16 +0400
commit9ff4fa667108eeecfaaaae477b9e3708c0db5eab (patch)
tree025fd5ede7537919d4c70ee2423ebefc2853ae57 /source/blender/compositor
parent2390c95cf1435c19adcb22263b27750ea3ca81e7 (diff)
style cleanup
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/nodes/COM_DefocusNode.cpp3
-rw-r--r--source/blender/compositor/operations/COM_BokehBlurOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_CombineChannelsOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp3
5 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cpp b/source/blender/compositor/nodes/COM_DefocusNode.cpp
index 65825a60b50..7354c4fcd65 100644
--- a/source/blender/compositor/nodes/COM_DefocusNode.cpp
+++ b/source/blender/compositor/nodes/COM_DefocusNode.cpp
@@ -105,7 +105,8 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext
VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation();
if (data->preview) {
operation->setQuality(COM_QUALITY_LOW);
- } else {
+ }
+ else {
operation->setQuality(context->getQuality());
}
operation->setMaxBlur(data->maxblur);
diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
index 7d190332c37..46c27496e9a 100644
--- a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
@@ -156,7 +156,8 @@ bool BokehBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffe
newInput.xmin = input->xmin - (this->m_size * this->getWidth() / 100.0f);
newInput.ymax = input->ymax + (this->m_size * this->getWidth() / 100.0f);
newInput.ymin = input->ymin - (this->m_size * this->getWidth() / 100.0f);
- } else {
+ }
+ else {
newInput.xmax = input->xmax + (10.0f * this->getWidth() / 100.0f);
newInput.xmin = input->xmin - (10.0f * this->getWidth() / 100.0f);
newInput.ymax = input->ymax + (10.0f * this->getWidth() / 100.0f);
diff --git a/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp b/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
index d05040c4c12..354fe51c068 100644
--- a/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
+++ b/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
@@ -50,7 +50,8 @@ bool CombineChannelsOperation::determineDependingAreaOfInterest(rcti *input, Rea
output->xmax = tempOutput.xmax;
output->ymax = tempOutput.ymax;
first = false;
- } else {
+ }
+ else {
output->xmin = MIN2(output->xmin, tempOutput.xmin);
output->ymin = MIN2(output->ymin, tempOutput.ymin);
output->xmax = MAX2(output->xmax, tempOutput.xmax);
diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
index f7ad3115f24..74043e187bc 100644
--- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
@@ -286,7 +286,8 @@ void GaussianBlurReferenceOperation::executePixel(float *color, int x, int y, vo
if (refradx == 1 && refrady == 1) {
memorybuffer->readNoCheck(color, x, y);
- } else {
+ }
+ else {
int minxr = x - refradx < 0 ? -x : -refradx;
int maxxr = x + refradx > imgx ? imgx - x : refradx;
int minyr = y - refrady < 0 ? -y : -refrady;
diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
index dcf9262d646..00ad319e3b7 100644
--- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
+++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
@@ -78,7 +78,8 @@ bool ProjectorLensDistortionOperation::determineDependingAreaOfInterest(rcti *in
newInput.ymin = input->ymin;
newInput.xmin = input->xmin - this->m_kr2 - 2;
newInput.xmax = input->xmax + this->m_kr2 + 2;
- } else {
+ }
+ else {
newInput.xmin = input->xmin - 7; /* (0.25f * 20 * 1) + 2 == worse case dispersion */
newInput.ymin = input->ymin;
newInput.ymax = input->ymax;