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

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-10-11 09:08:30 +11:00
parent 95f2604ea7 2083a7e274
commit 66738d4aa0
44 changed files with 172 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/intern/COM_NodeOperation.cpp
View File

@@ -171,7 +171,7 @@ bool NodeOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOper
rcti tempOutput;
bool first = true;
for (int i = 0; i < getNumberOfInputSockets(); i ++) {
NodeOperation * inputOperation = this->getInputOperation(i);
NodeOperation *inputOperation = this->getInputOperation(i);
if (inputOperation && inputOperation->determineDependingAreaOfInterest(input, readOperation, &tempOutput)) {
if (first) {
output->xmin = tempOutput.xmin;

2
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
View File

@@ -288,7 +288,7 @@ void InverseSearchRadiusOperation::initExecution()
void *InverseSearchRadiusOperation::initializeTileData(rcti *rect)
{
MemoryBuffer * data = new MemoryBuffer(COM_DT_COLOR, rect);
MemoryBuffer *data = new MemoryBuffer(COM_DT_COLOR, rect);
float *buffer = data->getBuffer();
int x, y;
int width = this->m_inputRadius->getWidth();