diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:23:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:24:20 +0300 |
commit | 9a11aeb300cef2eef5df3b606468a6bcdaca3550 (patch) | |
tree | 7265ef366b503021c8d18497d04b49a374309829 /source/blender/compositor | |
parent | 3a14a0381288ae9f49d1ab489a250cd29a00e771 (diff) | |
parent | 95eb9f22e69622c5817707fa9534521613e7d7cc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor')
-rw-r--r-- | source/blender/compositor/operations/COM_CompositorOperation.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index fe13f3d60a2..241ae20ce33 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -152,31 +152,31 @@ void CompositorOperation::executeRegion(rcti *rect, unsigned int /*tileNumber*/) const RenderData *rd = this->m_rd; if (rd->mode & R_BORDER && rd->mode & R_CROP) { - /*! - When using cropped render result, need to re-position area of interest, - so it'll natch bounds of render border within frame. By default, canvas - will be centered between full frame and cropped frame, so we use such - scheme to map cropped coordinates to full-frame coordinates - - ^ Y - | Width - +------------------------------------------------+ - | | - | | - | Centered canvas, we map coordinate from it | - | +------------------+ | - | | | | H - | | | | e - | +------------------+ . Center | | i - | | | | | | g - | | | | | | h - | |....dx.... +------|-----------+ | t - | | . dy | | - | +------------------+ | - | Render border, we map coordinates to it | - | | X - +------------------------------------------------+----> - Full frame + /** + * When using cropped render result, need to re-position area of interest, + * so it'll natch bounds of render border within frame. By default, canvas + * will be centered between full frame and cropped frame, so we use such + * scheme to map cropped coordinates to full-frame coordinates + * + * ^ Y + * | Width + * +------------------------------------------------+ + * | | + * | | + * | Centered canvas, we map coordinate from it | + * | +------------------+ | + * | | | | H + * | | | | e + * | +------------------+ . Center | | i + * | | | | | | g + * | | | | | | h + * | |....dx.... +------|-----------+ | t + * | | . dy | | + * | +------------------+ | + * | Render border, we map coordinates to it | + * | | X + * +------------------------------------------------+----> + * Full frame */ int full_width = rd->xsch * rd->size / 100; |