Fix for

 * [#32040] size-input of a blur-node is uniform for the whole picture
 * [#32062] Blur node Size input is not working with 
 * [#32140] Blur Node using a greyscale input as size multiplier fails
to work

Node now has a new option (new compositor cannot detect if the connected
part is a single value, or an image connected).

With this option the use of a reference image to multiply the size of
the blur per pixel can be enabled/disabled.

Regards, 
Jeroen
 - At Mind -

1 files changed, 7 insertions, 13 deletions

diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
index 1a134c20e63..45140855464 100644
--- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
@@ -49,22 +49,18 @@ public:
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 };
 
-class GaussianBokehBlurReferenceOperation : public NodeOperation, public QualityStepHelper {
+class GaussianBlurReferenceOperation : public BlurBaseOperation {
 private:
-	SocketReader * m_inputImage;
-	SocketReader * m_inputSize;
-	float *m_gausstab;
-	NodeBlurData *m_data;
+	float **m_maintabs;
 	
 	void updateGauss();
+	int m_radx;
+	int m_rady;
+	float m_radxf;
+	float m_radyf;
 
-	static const int radxf = 256.0f;
-	static const int radyf = 256.0f;
-	static const int radx = 256;
-	static const int rady = 256;
-	
 public:
-	GaussianBokehBlurReferenceOperation();
+	GaussianBlurReferenceOperation();
 	void initExecution();
 	void *initializeTileData(rcti *rect);
 	/**
@@ -78,8 +74,6 @@ public:
 	void deinitExecution();
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-
-	void setData(NodeBlurData *data) { this->m_data = data; }
 };
 
 #endif