archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

When using border rendering, use the same border for compositor

Browse Source 
This makes compositing as fast as it's possible in this case.

The only thing is border render+crop will still give funcy
results. This is the next thing to be solved in compositor.
This commit is contained in:
Sergey Sharybin
2013-03-20 18:01:41 +00:00
parent b5ac9639dc
commit 1b9e17fb9a
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/compositor/intern/COM_ExecutionGroup.cpp
View File

@@ -633,3 +633,13 @@ void ExecutionGroup::setViewerBorder(float xmin, float xmax, float ymin, float y
ymin * this->m_height, ymax * this->m_height);
}
}
void ExecutionGroup::setRenderBorder(float xmin, float xmax, float ymin, float ymax)
{
NodeOperation *operation = this->getOutputNodeOperation();
if (operation->isOutputOperation(true) && !(operation->isViewerOperation() || operation->isPreviewOperation())) {
BLI_rcti_init(&this->m_viewerBorder, xmin * this->m_width, xmax * this->m_width,
ymin * this->m_height, ymax * this->m_height);
}
}

2
source/blender/compositor/intern/COM_ExecutionGroup.h
View File

@@ -417,6 +417,8 @@ public:
*/
void setViewerBorder(float xmin, float xmax, float ymin, float ymax);
void setRenderBorder(float xmin, float xmax, float ymin, float ymax);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionGroup")
#endif

12
source/blender/compositor/intern/COM_ExecutionSystem.cpp
View File

@@ -95,6 +95,18 @@ ExecutionSystem::ExecutionSystem(RenderData *rd, bNodeTree *editingtree, bool re
ExecutionGroup *executionGroup = this->m_groups[index];
executionGroup->determineResolution(resolution);
if (rendering) {
/* TODO: would be nice to support cropping as well, but for now
* don't use border for compo when crop is enabled,
* otherwise area of interest will be a way off from rendered
* stuff
*/
if ((rd->mode & R_BORDER) && !(rd->mode & R_CROP)) {
executionGroup->setRenderBorder(rd->border.xmin, rd->border.xmax,
rd->border.ymin, rd->border.ymax);
}
}
if (use_viewer_border) {
executionGroup->setViewerBorder(viewer_border->xmin, viewer_border->xmax,
viewer_border->ymin, viewer_border->ymax);