* fixed defocus background blurin...

4 files changed, 48 insertions, 34 deletions

diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
index 296056b6c48..59ec9525fa6 100644
--- a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
@@ -37,24 +37,24 @@ BokehBlurNode::BokehBlurNode(bNode *editorNode) : Node(editorNode)
 
 void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	Object *camob = context->getScene()->camera;
+//	Object *camob = context->getScene()->camera;
 
-	if (this->getInputSocket(2)->isConnected()) {
-		VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation();
-		ConvertDepthToRadiusOperation *converter = new ConvertDepthToRadiusOperation();
-		converter->setfStop(this->getbNode()->custom3);
-		converter->setCameraObject(camob);
-		operation->setMaxBlur((int)this->getbNode()->custom4);
-		operation->setQuality(context->getQuality());
-		this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
-		this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
-		this->getInputSocket(2)->relinkConnections(converter->getInputSocket(0), 2, graph);
-		addLink(graph, converter->getOutputSocket(), operation->getInputSocket(2));
-		graph->addOperation(operation);
-		graph->addOperation(converter);
-		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
-	}
-	else {
+//	if (this->getInputSocket(2)->isConnected()) {
+//		VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation();
+//		ConvertDepthToRadiusOperation *converter = new ConvertDepthToRadiusOperation();
+//		converter->setfStop(this->getbNode()->custom3);
+//		converter->setCameraObject(camob);
+//		operation->setMaxBlur((int)this->getbNode()->custom4);
+//		operation->setQuality(context->getQuality());
+//		this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
+//		this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
+//		this->getInputSocket(2)->relinkConnections(converter->getInputSocket(0), 2, graph);
+//		addLink(graph, converter->getOutputSocket(), operation->getInputSocket(2));
+//		graph->addOperation(operation);
+//		graph->addOperation(converter);
+//		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
+//	}
+//	else {
 		BokehBlurOperation *operation = new BokehBlurOperation();
 		this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 		this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
@@ -63,5 +63,5 @@ void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 		operation->setQuality(context->getQuality());
 		graph->addOperation(operation);
 		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
-	}
+//	}
 }
diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cpp b/source/blender/compositor/nodes/COM_DefocusNode.cpp
index d1f90b490ad..62a9693889a 100644
--- a/source/blender/compositor/nodes/COM_DefocusNode.cpp
+++ b/source/blender/compositor/nodes/COM_DefocusNode.cpp
@@ -96,6 +96,7 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext
 	operation->setThreshold(data->bthresh);
 	addLink(graph, bokeh->getOutputSocket(), operation->getInputSocket(1));
 	addLink(graph, radiusOperation->getOutputSocket(), operation->getInputSocket(2));
+	addLink(graph, radiusOperation->getInputSocket(0)->getConnection()->getFromSocket(), operation->getInputSocket(3));
 	if (data->gamco) {
 		GammaCorrectOperation *correct = new GammaCorrectOperation();
 		GammaUncorrectOperation *inverse = new GammaUncorrectOperation();
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
index 92e456a7081..c17e51e6391 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
@@ -31,13 +31,15 @@ VariableSizeBokehBlurOperation::VariableSizeBokehBlurOperation() : NodeOperation
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); // do not resize the bokeh image.
-	this->addInputSocket(COM_DT_VALUE);
+	this->addInputSocket(COM_DT_VALUE); // radius
+	this->addInputSocket(COM_DT_VALUE); // depth
 	this->addOutputSocket(COM_DT_COLOR);
 	this->setComplex(true);
 
 	this->inputProgram = NULL;
 	this->inputBokehProgram = NULL;
 	this->inputSizeProgram = NULL;
+	this->inputDepthProgram = NULL;
 	this->maxBlur = 32.0f;
 	this->threshold = 1.0f;
 }
@@ -48,6 +50,7 @@ void VariableSizeBokehBlurOperation::initExecution()
 	this->inputProgram = getInputSocketReader(0);
 	this->inputBokehProgram = getInputSocketReader(1);
 	this->inputSizeProgram = getInputSocketReader(2);
+	this->inputDepthProgram = getInputSocketReader(3);
 	QualityStepHelper::initExecution(COM_QH_INCREASE);
 }
 
@@ -56,7 +59,7 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me
 	float readColor[4];
 	float bokeh[4];
 	float tempSize[4];
-	float tempSizeCenter[4];
+	float tempDepth[4];
 	float multiplier_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 	float color_accum[4]      = {0.0f, 0.0f, 0.0f, 0.0f};
 
@@ -65,29 +68,34 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me
 	int minx = x - maxBlur;
 	int maxx = x + maxBlur;
 	{
-		inputSizeProgram->read(tempSizeCenter, x, y, COM_PS_NEAREST, inputBuffers);
+		inputSizeProgram->read(tempSize, x, y, COM_PS_NEAREST, inputBuffers);
+		inputDepthProgram->read(tempDepth, x, y, COM_PS_NEAREST, inputBuffers);
 		inputProgram->read(readColor, x, y, COM_PS_NEAREST, inputBuffers);
 		add_v4_v4(color_accum, readColor);
 		add_v4_fl(multiplier_accum, 1.0f);
-		float sizeCenter = tempSizeCenter[0];
+		float sizeCenter = tempSize[0];
+		float centerDepth = tempDepth[0]+threshold;
 		
 		for (int ny = miny; ny < maxy; ny += QualityStepHelper::getStep()) {
 			for (int nx = minx; nx < maxx; nx += QualityStepHelper::getStep()) {
 				if (nx >= 0 && nx < this->getWidth() && ny >= 0 && ny < getHeight()) {
+					inputDepthProgram->read(tempDepth, nx, ny, COM_PS_NEAREST, inputBuffers);
 					inputSizeProgram->read(tempSize, nx, ny, COM_PS_NEAREST, inputBuffers);
 					float size = tempSize[0];
-					if ((sizeCenter > threshold && size > threshold) || size <= threshold) {
-						float dx = nx - x;
-						float dy = ny - y;
-						if (nx == x && ny == y) {
-						}
-						else if (size >= fabsf(dx) && size >= fabsf(dy)) {
-							float u = 256 + dx * 256 / size;
-							float v = 256 + dy * 256 / size;
-							inputBokehProgram->read(bokeh, u, v, COM_PS_NEAREST, inputBuffers);
-							inputProgram->read(readColor, nx, ny, COM_PS_NEAREST, inputBuffers);
-							madd_v4_v4v4(color_accum, bokeh, readColor);
-							add_v4_v4(multiplier_accum, bokeh);
+					if (tempDepth[0] < centerDepth) {
+						if ((sizeCenter > threshold && size > threshold) || size <= threshold) {
+							float dx = nx - x;
+							float dy = ny - y;
+							if (nx == x && ny == y) {
+							}
+							else if (size >= fabsf(dx) && size >= fabsf(dy)) {
+								float u = 256 + dx * 256 / size;
+								float v = 256 + dy * 256 / size;
+								inputBokehProgram->read(bokeh, u, v, COM_PS_NEAREST, inputBuffers);
+								inputProgram->read(readColor, nx, ny, COM_PS_NEAREST, inputBuffers);
+								madd_v4_v4v4(color_accum, bokeh, readColor);
+								add_v4_v4(multiplier_accum, bokeh);
+							}
 						}
 					}
 				}
@@ -131,6 +139,10 @@ bool VariableSizeBokehBlurOperation::determineDependingAreaOfInterest(rcti *inpu
 	if (operation->determineDependingAreaOfInterest(&bokehInput, readOperation, output) ) {
 		return true;
 	}
+	operation = getInputOperation(3);
+	if (operation->determineDependingAreaOfInterest(&newInput, readOperation, output) ) {
+		return true;
+	}
 	operation = getInputOperation(0);
 	if (operation->determineDependingAreaOfInterest(&newInput, readOperation, output) ) {
 		return true;
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
index ede8f0333b4..d04bf08405f 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
@@ -32,6 +32,7 @@ private:
 	SocketReader *inputProgram;
 	SocketReader *inputBokehProgram;
 	SocketReader *inputSizeProgram;
+	SocketReader *inputDepthProgram;
 
 public:
 	VariableSizeBokehBlurOperation();