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

[Jeroen Bakker]

Revision: 46344
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46344
Author:   jbakker
Date:     2012-05-06 12:34:48 +0000 (Sun, 06 May 2012)
Log Message:
-----------
TileBranch
 * fix for [#31309] brightness/contrast node discards Green and Blue channels

Modified Paths:
--------------
    branches/tile/source/blender/compositor/operations/COM_BrightnessOperation.cpp
    branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp

Modified: branches/tile/source/blender/compositor/operations/COM_BrightnessOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_BrightnessOperation.cpp	2012-05-06 12:13:45 UTC (rev 46343)
+++ branches/tile/source/blender/compositor/operations/COM_BrightnessOperation.cpp	2012-05-06 12:34:48 UTC (rev 46344)
@@ -26,7 +26,7 @@
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VALUE);
 	this->addInputSocket(COM_DT_VALUE);
-	this->addOutputSocket(COM_DT_VALUE);
+	this->addOutputSocket(COM_DT_COLOR);
 	this->inputProgram = NULL;
 }
 void BrightnessOperation::initExecution() {

Modified: branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp	2012-05-06 12:13:45 UTC (rev 46343)
+++ branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp	2012-05-06 12:34:48 UTC (rev 46344)
@@ -53,7 +53,7 @@
 	const float width = getWidth();
 	const float height = getHeight();
 
-	const float a= angle * (float)M_PI / 180.f;
+	const float a= angle;
 	const float itsc= 1.f / pow(2.f, (float)iterations);
 	float D;
 
@@ -64,7 +64,7 @@
 	tx=  itsc * D * cos(a);
 	ty= -itsc * D * sin(a);
 	sc=  itsc * zoom;
-	rot= itsc * spin * (float)M_PI / 180.f;
+	rot= itsc * spin;
 
 }
 
@@ -114,10 +114,10 @@
 bool DirectionalBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) {
 	rcti newInput;
 
-	newInput.xmax = input->xmax + (this->data->distance*this->getWidth());
-	newInput.xmin = input->xmin - (this->data->distance*this->getWidth());
-	newInput.ymax = input->ymax + (this->data->distance*this->getHeight());
-	newInput.ymin = input->ymin - (this->data->distance*this->getHeight());
+	newInput.xmax = this->getWidth();
+	newInput.xmin = 0;
+	newInput.ymax = this->getHeight();
+	newInput.ymin = 0;
 
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }