[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45526] branches/tile/source/blender/ compositor: TileBranch

[Jeroen Bakker]

Revision: 45526
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45526
Author:   jbakker
Date:     2012-04-11 04:40:45 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
TileBranch
 * fixed the vectorBlur additional artifacts. These were created as the editor output socket is an vector, but the output operation was a color. this color type was set to the editor node output socket type. this was an early optimization, and this is the only 'issue' that we can have with it :)
 * replaced spaces => tabs in ConvertVectorToColor
 - At Mind - 

Modified Paths:
--------------
    branches/tile/source/blender/compositor/intern/COM_OutputSocket.cpp
    branches/tile/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
    branches/tile/source/blender/compositor/operations/COM_VectorBlurOperation.cpp

Modified: branches/tile/source/blender/compositor/intern/COM_OutputSocket.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_OutputSocket.cpp	2012-04-10 23:53:46 UTC (rev 45525)
+++ branches/tile/source/blender/compositor/intern/COM_OutputSocket.cpp	2012-04-11 04:40:45 UTC (rev 45526)
@@ -99,7 +99,7 @@
 			SocketConnection *connection = this->connections[0];
 			connection->setFromSocket(relinkToSocket);
 			relinkToSocket->addConnection(connection);
-			relinkToSocket->setActualDataType(this->getActualDataType());
+//			relinkToSocket->setActualDataType(this->getActualDataType());
 			this->connections.erase(this->connections.begin());
 		} else {
 			unsigned int index;
@@ -108,7 +108,7 @@
 				connection->setFromSocket(relinkToSocket);
 				relinkToSocket->addConnection(connection);
 			}
-			relinkToSocket->setActualDataType(this->getActualDataType());
+//			relinkToSocket->setActualDataType(this->getActualDataType());
 			this->connections.clear();
 		}
 	}

Modified: branches/tile/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp	2012-04-10 23:53:46 UTC (rev 45525)
+++ branches/tile/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp	2012-04-11 04:40:45 UTC (rev 45526)
@@ -23,9 +23,9 @@
 #include "COM_ConvertVectorToColorOperation.h"
 
 ConvertVectorToColorOperation::ConvertVectorToColorOperation(): NodeOperation() {
-    this->addInputSocket(COM_DT_VECTOR);
-    this->addOutputSocket(COM_DT_COLOR);
-    this->inputOperation = NULL;
+	this->addInputSocket(COM_DT_VECTOR);
+	this->addOutputSocket(COM_DT_COLOR);
+	this->inputOperation = NULL;
 }
 
 void ConvertVectorToColorOperation::initExecution() {
@@ -34,9 +34,9 @@
 
 void ConvertVectorToColorOperation::executePixel(float* outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) {
 	inputOperation->read(outputValue, x, y, sampler, inputBuffers);
-    outputValue[3] = 1.0f;
+	outputValue[3] = 1.0f;
 }
 
 void ConvertVectorToColorOperation::deinitExecution() {
-    this->inputOperation = NULL;
+	this->inputOperation = NULL;
 }

Modified: branches/tile/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_VectorBlurOperation.cpp	2012-04-10 23:53:46 UTC (rev 45525)
+++ branches/tile/source/blender/compositor/operations/COM_VectorBlurOperation.cpp	2012-04-11 04:40:45 UTC (rev 45526)
@@ -78,7 +78,7 @@
 		MemoryBuffer* speed= (MemoryBuffer*)inputSpeedProgram->initializeTileData(rect, memoryBuffers);
 		MemoryBuffer* z = (MemoryBuffer*)inputZProgram->initializeTileData(rect, memoryBuffers);
 		float* data = new float[this->getWidth()*this->getHeight()*COM_NUMBER_OF_CHANNELS];
-//		memcpy(data, tile->getBuffer(),this->getWidth()*this->getHeight()*COM_NUMBER_OF_CHANNELS*sizeof(float));
+		memcpy(data, tile->getBuffer(),this->getWidth()*this->getHeight()*COM_NUMBER_OF_CHANNELS*sizeof(float));
 		this->generateVectorBlur(data, tile, speed, z);
 		this->cachedInstance = data;
 	}