griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge ^/trunk/blender -r48129:48133

Browse Source
This commit is contained in:
Campbell Barton
2012-06-20 17:37:37 +00:00
parent e631cf7062 dc7770d1a1
commit 3966f7451d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ void *CalculateStandardDeviationOperation::initializeTileData(rcti *rect, Memory
float *buffer = tile->getBuffer();
int size = tile->getWidth() * tile->getHeight();
int pixels = 0;
float sum;
float sum = 0.0f;
float mean = this->result;
for (int i = 0, offset = 0; i < size; i++, offset += 4) {
if (buffer[offset + 3] > 0) {

3
source/blender/compositor/operations/COM_ReadBufferOperation.cpp
View File

@@ -76,7 +76,8 @@ bool ReadBufferOperation::determineDependingAreaOfInterest(rcti *input, ReadBuff
return false;
}
void ReadBufferOperation::readResolutionFromWriteBuffer() {
void ReadBufferOperation::readResolutionFromWriteBuffer()
{
if (this->memoryProxy != NULL) {
WriteBufferOperation *operation = memoryProxy->getWriteBufferOperation();
this->setWidth(operation->getWidth());

3
source/blender/compositor/operations/COM_RotateOperation.cpp
View File

@@ -48,7 +48,8 @@ void RotateOperation::deinitExecution()
this->degreeSocket = NULL;
}
inline void RotateOperation::ensureDegree() {
inline void RotateOperation::ensureDegree()
{
if (!isDegreeSet) {
float degree[4];
this->degreeSocket->read(degree, 0, 0, COM_PS_NEAREST, NULL);