diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-01 03:38:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-01 03:38:36 +0300 |
| commit | 8ddaa6a4e237cfa667ace4a00f147e2683d83840 (patch) | |
| tree | 96c6e1b8ca4051317b42a3b77269c61c45af8f66 /source/blender/compositor/operations/COM_RenderLayersProg.cpp | |
| parent | b71366801e45dafd7fb8c658edeaf88dfb4cb84e (diff) | |
| parent | a372638a76e05aaa44589845680c15a7f09a7f1e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor/operations/COM_RenderLayersProg.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_RenderLayersProg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp index f2f1b211a97..26654b31e16 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp @@ -246,4 +246,4 @@ void RenderLayersDepthProg::executePixelSampled(float output[4], float x, float unsigned int offset = (iy * this->getWidth() + ix); output[0] = inputBuffer[offset]; } -}
\ No newline at end of file +} |