Revision: 46540
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46540
Author: jbakker
Date: 2012-05-11 07:03:04 +0000 (Fri, 11 May 2012)
Log Message:
-----------
TileBranch
* removed debug statements
Modified Paths:
--------------
branches/tile/source/blender/compositor/intern/COM_Converter.cpp
branches/tile/source/blender/compositor/intern/COM_InputSocket.cpp
branches/tile/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/tile/source/blender/compositor/intern/COM_OutputSocket.cpp
branches/tile/source/blender/compositor/intern/COM_Socket.cpp
branches/tile/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
Modified: branches/tile/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_Converter.cpp
2012-05-11 06:51:22 UTC (rev 46539)
+++ branches/tile/source/blender/compositor/intern/COM_Converter.cpp
2012-05-11 07:03:04 UTC (rev 46540)
@@ -92,7 +92,6 @@
#include "COM_TimeNode.h"
#include "COM_DirectionalBlurNode.h"
#include "COM_ZCombineNode.h"
-#include <stdio.h>
#include "COM_SetValueOperation.h"
#include "COM_ScaleOperation.h"
#include "COM_ExecutionSystemHelper.h"
@@ -376,8 +375,6 @@
converter = new ConvertVectorToValueOperation();
} else if (fromDatatype == COM_DT_VECTOR && toDatatype == COM_DT_COLOR)
{
converter = new ConvertVectorToColorOperation();
- } else {
- printf("ERROR: unknown conversion detected\n");
}
if (converter != NULL) {
inputSocket->relinkConnections(converter->getInputSocket(0));
Modified: branches/tile/source/blender/compositor/intern/COM_InputSocket.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_InputSocket.cpp
2012-05-11 06:51:22 UTC (rev 46539)
+++ branches/tile/source/blender/compositor/intern/COM_InputSocket.cpp
2012-05-11 07:03:04 UTC (rev 46540)
@@ -24,7 +24,6 @@
#include "COM_Node.h"
#include "COM_SocketConnection.h"
#include "COM_ExecutionSystem.h"
-#include <stdio.h>
InputSocket::InputSocket(DataType datatype) :Socket(datatype) {
this->connection = NULL;
@@ -84,7 +83,6 @@
return COM_DT_VALUE;
}
}
- printf("WARNING: Unknown how to do conversion to supported datatype\n");
return this->getDataType();
}
@@ -122,7 +120,6 @@
Node* node = (Node*)this->getNode();
switch (this->getActualDataType()) {
case COM_DT_UNKNOWN:
- printf("relink autoconnect with unknown
datatype\n");
case COM_DT_COLOR:
node->addSetColorOperation(graph,
relinkToSocket, editorNodeInputSocketIndex);
break;
@@ -151,7 +148,6 @@
Node* node = (Node*)this->getNode();
switch (this->getActualDataType()) {
case COM_DT_UNKNOWN:
- printf("relink autoconnect with unknown
datatype\n");
case COM_DT_COLOR:
node->addSetColorOperation(graph,
relinkToSocket, editorNodeInputSocketIndex);
break;
Modified: branches/tile/source/blender/compositor/intern/COM_MemoryBuffer.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_MemoryBuffer.cpp
2012-05-11 06:51:22 UTC (rev 46539)
+++ branches/tile/source/blender/compositor/intern/COM_MemoryBuffer.cpp
2012-05-11 07:03:04 UTC (rev 46540)
@@ -23,7 +23,6 @@
#include "COM_MemoryBuffer.h"
#include "MEM_guardedalloc.h"
#include "BLI_math.h"
-#include <fstream>
#include "BKE_global.h"
unsigned int MemoryBuffer::determineBufferSize() {
@@ -86,7 +85,6 @@
void MemoryBuffer::copyContentFrom(MemoryBuffer *otherBuffer) {
if (!otherBuffer) {
- printf("no buffer to copy from\n");
return;
}
unsigned int otherY;
Modified: branches/tile/source/blender/compositor/intern/COM_OutputSocket.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_OutputSocket.cpp
2012-05-11 06:51:22 UTC (rev 46539)
+++ branches/tile/source/blender/compositor/intern/COM_OutputSocket.cpp
2012-05-11 07:03:04 UTC (rev 46540)
@@ -24,7 +24,6 @@
#include "COM_Node.h"
#include "COM_SocketConnection.h"
#include "COM_NodeOperation.h"
-#include <stdio.h>
OutputSocket::OutputSocket(DataType datatype) :Socket(datatype) {
this->inputSocketDataTypeDeterminatorIndex = -1;
@@ -46,8 +45,6 @@
NodeOperation* operation = (NodeOperation*)node;
operation->determineResolution(resolution, preferredResolution);
operation->setResolution(resolution);
- } else {
- printf("ERROR is not an operation\n");
}
}
Modified: branches/tile/source/blender/compositor/intern/COM_Socket.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_Socket.cpp
2012-05-11 06:51:22 UTC (rev 46539)
+++ branches/tile/source/blender/compositor/intern/COM_Socket.cpp
2012-05-11 07:03:04 UTC (rev 46540)
@@ -23,7 +23,6 @@
#include "COM_Socket.h"
#include "COM_Node.h"
#include "COM_SocketConnection.h"
-#include <stdio.h>
Socket::Socket(DataType datatype) {
this->datatype = datatype;
@@ -44,8 +43,5 @@
DataType Socket::getActualDataType() const {return this->actualType;}
void Socket::setActualDataType(DataType actualType) {
- if (actualType != COM_DT_VALUE && actualType != COM_DT_VECTOR &&
actualType != COM_DT_COLOR) {
- printf("WARNING: setting incorrect data type to socket");
- }
this->actualType = actualType;
}
Modified: branches/tile/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
2012-05-11 06:51:22 UTC (rev 46539)
+++ branches/tile/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
2012-05-11 07:03:04 UTC (rev 46540)
@@ -22,7 +22,6 @@
#include "COM_SocketProxyNode.h"
#include "COM_SocketConnection.h"
-#include "stdio.h"
#include "COM_SocketProxyOperation.h"
#include "COM_ExecutionSystem.h"
#include "COM_SetValueOperation.h"
Modified:
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
===================================================================
---
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
2012-05-11 06:51:22 UTC (rev 46539)
+++
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
2012-05-11 07:03:04 UTC (rev 46540)
@@ -35,11 +35,6 @@
this->inputProgram = NULL;
}
-void* DirectionalBlurOperation::initializeTileData(rcti *rect, MemoryBuffer
**memoryBuffers) {
- void* buffer = inputProgram->initializeTileData(NULL, memoryBuffers);
- return buffer;
-}
-
void DirectionalBlurOperation::initExecution() {
this->inputProgram = getInputSocketReader(0);
QualityStepHelper::initExecution(COM_QH_INCREASE);
Modified:
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
===================================================================
---
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
2012-05-11 06:51:22 UTC (rev 46539)
+++
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
2012-05-11 07:03:04 UTC (rev 46540)
@@ -37,7 +37,6 @@
public:
DirectionalBlurOperation();
- void* initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
/**
* the inner loop of this program
*/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
