diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-31 22:40:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-31 22:40:06 +0400 |
commit | 02b927b8c4702cadf089f3e26fa553bdc66483b1 (patch) | |
tree | db5a7e5a005de841d3c730a6b4ef73372ef741eb /source/blender/compositor | |
parent | 9547b76c2e8e0f6aa07858e94e4f0c404b86ac7d (diff) |
style cleanup
Diffstat (limited to 'source/blender/compositor')
4 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 7d709dd919c..80b91b2364c 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -275,7 +275,8 @@ void WorkScheduler::initialize() printf("%s", build_log); delete build_log; - } else { + } + else { unsigned int indexDevices; for (indexDevices = 0 ; indexDevices < totalNumberOfDevices ; indexDevices ++) { cl_device_id device = cldevices[indexDevices]; diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp index b722e40a875..47791956865 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp @@ -52,7 +52,8 @@ void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorCont this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); } graph->addOperation(operation); - } else if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE) { + } + else if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE) { if (editorNode->custom2 > 0) { DilateDistanceOperation * operation = new DilateDistanceOperation(); operation->setDistance(editorNode->custom2); @@ -67,7 +68,8 @@ void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorCont this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } - } else { + } + else { if (editorNode->custom2 > 0) { DilateStepOperation * operation = new DilateStepOperation(); operation->setIterations(editorNode->custom2); diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 09e172f395e..d75cb39325f 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -68,7 +68,8 @@ void CompositorOperation::deinitExecution() MEM_freeN(rr->rectf); } rr->rectf = outputBuffer; - } else { + } + else { if (this->outputBuffer) { MEM_freeN(this->outputBuffer); } diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h index f583493340b..5792248464a 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h @@ -81,10 +81,11 @@ public: if (x<0 || x >= this->width || y <0 || y >= this->height) { *u = x; *v = y; - } else { - + } + else { int offset = y * this->width + x; - int offset2 = offset*2; + int offset2 = offset * 2; + if (!bufferCalculated[offset]) { //float overscan = 0.0f; float w = (float)this->width/* / (1 + overscan) */; @@ -99,7 +100,8 @@ public: if (inverted) { BKE_tracking_invert_intrinsics(trackingData, in, out); - } else { + } + else { BKE_tracking_apply_intrinsics(trackingData, in, out); } |