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>2019-04-18 18:17:32 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-18 18:19:44 +0300
commit4439e5d0ba3ffde3841ec44405a9bcaf800be279 (patch)
treed0955d8e18d854603da54bed39c46ef9627c4736 /source/blender/compositor/operations
parent098f75897e3ddf4bb93f64cecb322d7370127419 (diff)
Cleanup: add trailing commas to avoid right shift
Diffstat (limited to 'source/blender/compositor/operations')
-rw-r--r--source/blender/compositor/operations/COM_MaskOperation.cpp6
-rw-r--r--source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp20
-rw-r--r--source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp10
3 files changed, 22 insertions, 14 deletions
diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp b/source/blender/compositor/operations/COM_MaskOperation.cpp
index 6f146d9e1e6..0c9208fb6bb 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_MaskOperation.cpp
@@ -134,8 +134,10 @@ void MaskOperation::executePixelSampled(float output[4],
float y,
PixelSampler /*sampler*/)
{
- const float xy[2] = {(x * this->m_maskWidthInv) + this->m_mask_px_ofs[0],
- (y * this->m_maskHeightInv) + this->m_mask_px_ofs[1]};
+ const float xy[2] = {
+ (x * this->m_maskWidthInv) + this->m_mask_px_ofs[0],
+ (y * this->m_maskHeightInv) + this->m_mask_px_ofs[1],
+ };
if (this->m_rasterMaskHandleTot == 1) {
if (this->m_rasterMaskHandles[0]) {
diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
index 54d5d6e97a5..63640d43973 100644
--- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
+++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
@@ -125,10 +125,12 @@ void *PlaneCornerPinMaskOperation::initializeTileData(rcti *rect)
*/
lockMutex();
if (!m_corners_ready) {
- SocketReader *readers[4] = {getInputSocketReader(0),
- getInputSocketReader(1),
- getInputSocketReader(2),
- getInputSocketReader(3)};
+ SocketReader *readers[4] = {
+ getInputSocketReader(0),
+ getInputSocketReader(1),
+ getInputSocketReader(2),
+ getInputSocketReader(3),
+ };
float corners[4][2];
readCornersFromSockets(rect, readers, corners);
calculateCorners(corners, true, 0);
@@ -183,10 +185,12 @@ void *PlaneCornerPinWarpImageOperation::initializeTileData(rcti *rect)
lockMutex();
if (!m_corners_ready) {
/* corner sockets start at index 1 */
- SocketReader *readers[4] = {getInputSocketReader(1),
- getInputSocketReader(2),
- getInputSocketReader(3),
- getInputSocketReader(4)};
+ SocketReader *readers[4] = {
+ getInputSocketReader(1),
+ getInputSocketReader(2),
+ getInputSocketReader(3),
+ getInputSocketReader(4),
+ };
float corners[4][2];
readCornersFromSockets(rect, readers, corners);
calculateCorners(corners, true, 0);
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
index 8b0335754aa..02f13effc8f 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
@@ -151,10 +151,12 @@ void VariableSizeBokehBlurOperation::executePixel(float output[4], int x, int y,
if (size > this->m_threshold) {
float dx = nx - x;
if (size > fabsf(dx) && size > fabsf(dy)) {
- float uv[2] = {(float)(COM_BLUR_BOKEH_PIXELS / 2) +
- (dx / size) * (float)((COM_BLUR_BOKEH_PIXELS / 2) - 1),
- (float)(COM_BLUR_BOKEH_PIXELS / 2) +
- (dy / size) * (float)((COM_BLUR_BOKEH_PIXELS / 2) - 1)};
+ float uv[2] = {
+ (float)(COM_BLUR_BOKEH_PIXELS / 2) +
+ (dx / size) * (float)((COM_BLUR_BOKEH_PIXELS / 2) - 1),
+ (float)(COM_BLUR_BOKEH_PIXELS / 2) +
+ (dy / size) * (float)((COM_BLUR_BOKEH_PIXELS / 2) - 1),
+ };
inputBokehBuffer->read(bokeh, uv[0], uv[1]);
madd_v4_v4v4(color_accum, bokeh, &inputProgramFloatBuffer[offsetColorNxNy]);
add_v4_v4(multiplier_accum, bokeh);