Merge branch 'master' into blender2.8

3 files changed, 17 insertions, 17 deletions

diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.h b/source/blender/compositor/operations/COM_BokehImageOperation.h
index c4616e5fecb..510ff6377a0 100644
--- a/source/blender/compositor/operations/COM_BokehImageOperation.h
+++ b/source/blender/compositor/operations/COM_BokehImageOperation.h
@@ -90,18 +90,18 @@ private:
 	/**
 	 * \brief determine the coordinate of a flap cornder
 	 *
-	 * \param r result in bokehimage space are stored [x,y]
-	 * \param flapNumber the flap number to calculate
-	 * \param distance the lens distance is used to simulate lens shifts
+	 * \param r: result in bokehimage space are stored [x,y]
+	 * \param flapNumber: the flap number to calculate
+	 * \param distance: the lens distance is used to simulate lens shifts
 	 */
 	void detemineStartPointOfFlap(float r[2], int flapNumber, float distance);
 
 	/**
 	 * \brief Determine if a coordinate is inside the bokeh image
 	 *
-	 * \param distance the distance that will be used. This parameter is modified a bit to mimic lens shifts
-	 * \param x the x coordinate of the pixel to evaluate
-	 * \param y the y coordinate of the pixel to evaluate
+	 * \param distance: the distance that will be used. This parameter is modified a bit to mimic lens shifts
+	 * \param x: the x coordinate of the pixel to evaluate
+	 * \param y: the y coordinate of the pixel to evaluate
 	 * \return float range 0..1 0 is completely outside
 	 */
 	float isInsideBokeh(float distance, float x, float y);
@@ -125,14 +125,14 @@ public:
 
 	/**
 	 * \brief determine the resolution of this operation. currently fixed at [COM_BLUR_BOKEH_PIXELS, COM_BLUR_BOKEH_PIXELS]
-	 * \param resolution
-	 * \param preferredResolution
+	 * \param resolution:
+	 * \param preferredResolution:
 	 */
 	void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
 
 	/**
 	 * \brief set the node data
-	 * \param data
+	 * \param data:
 	 */
 	void setData(NodeBokehImage *data) { this->m_data = data; }
 
diff --git a/source/blender/compositor/operations/COM_PixelateOperation.h b/source/blender/compositor/operations/COM_PixelateOperation.h
index cd91c2ccc05..381c723f7e8 100644
--- a/source/blender/compositor/operations/COM_PixelateOperation.h
+++ b/source/blender/compositor/operations/COM_PixelateOperation.h
@@ -41,7 +41,7 @@ private:
 public:
 	/**
 	 * \brief PixelateOperation
-	 * \param dataType the datatype to create this operator for (saves datatype conversions)
+	 * \param dataType: the datatype to create this operator for (saves datatype conversions)
 	 */
 	PixelateOperation(DataType dataType);
 
@@ -57,10 +57,10 @@ public:
 
 	/**
 	 * \brief executePixel
-	 * \param output result
-	 * \param x x-coordinate
-	 * \param y y-coordinate
-	 * \param sampler sampler
+	 * \param output: result
+	 * \param x: x-coordinate
+	 * \param y: y-coordinate
+	 * \param sampler: sampler
 	 */
 	void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
 };
diff --git a/source/blender/compositor/operations/COM_SunBeamsOperation.cpp b/source/blender/compositor/operations/COM_SunBeamsOperation.cpp
index e556d366353..10d128d01c3 100644
--- a/source/blender/compositor/operations/COM_SunBeamsOperation.cpp
+++ b/source/blender/compositor/operations/COM_SunBeamsOperation.cpp
@@ -105,9 +105,9 @@ struct BufferLineAccumulator {
 	 * at dist_min from the target pt. This way the loop can be canceled as soon as it runs
 	 * out of the buffer rect, because no pixels further along the line can contribute.
 	 *
-	 * \param x, y  Start location in the buffer
-	 * \param num  Total steps in the loop
-	 * \param v, dv  Vertical offset in sector space, for line offset perpendicular to the loop axis
+	 * \param x, y: Start location in the buffer
+	 * \param num: Total steps in the loop
+	 * \param v, dv: Vertical offset in sector space, for line offset perpendicular to the loop axis
 	 */
 	static float *init_buffer_iterator(MemoryBuffer *input, const float source[2], const float co[2],
 	                                   float dist_min, float dist_max,