Merge branch 'master' into blender2.8

source/blender/imbuf/intern/filter.c

@@ -42,10 +42,6 @@
 
 #include "imbuf.h"
 
-/************************************************************************/
-/*				FILTERS					*/
-/************************************************************************/
-
 static void filtrow(unsigned char *point, int x)
 {
 	unsigned int c1, c2, c3, error;

source/blender/imbuf/intern/iris.c

@@ -124,7 +124,7 @@ static int compressrow(uchar *lbuf, uchar *rlebuf, int z, int cnt);
 static void lumrow(uchar *rgbptr, uchar *lumptr, int n);
 
 /*
- *	byte order independent read/write of shorts and ints.
+ * byte order independent read/write of shorts and ints.
  *
  */
 
@@ -245,9 +245,9 @@ int imb_is_a_iris(const uchar *mem)
 }
 
 /*
- *	longimagedata -
- *		read in a B/W RGB or RGBA iris image file and return a
- *	pointer to an array of ints.
+ * longimagedata -
+ * read in a B/W RGB or RGBA iris image file and return a
+ * pointer to an array of ints.
  *
  */
 

source/blender/imbuf/intern/jpeg.c

@@ -367,7 +367,7 @@ static ImBuf *ibJpegImageFromCinfo(struct jpeg_decompress_struct *cinfo, int fla
 				 * Because JPEG format don't support the
 				 * pair "key/value" like PNG, we store the
 				 * stampinfo in a single "encode" string:
-				 *	"Blender:key:value"
+				 * "Blender:key:value"
 				 *
 				 * That is why we need split it to the
 				 * common key/value here.
@@ -493,7 +493,7 @@ static void write_jpeg(struct jpeg_compress_struct *cinfo, struct ImBuf *ibuf)
 				 * The JPEG format don't support a pair "key/value"
 				 * like PNG, so we "encode" the stamp in a
 				 * single string:
-				 *	"Blender:key:value"
+				 * "Blender:key:value"
 				 *
 				 * The first "Blender" is a simple identify to help
 				 * in the read process.

source/blender/imbuf/intern/scaling.c

@@ -45,11 +45,6 @@
 
 #include "BLI_sys_types.h" // for intptr_t support
 
-/************************************************************************/
-/*								SCALING									*/
-/************************************************************************/
-
-
 static void imb_half_x_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1)
 {
 	uchar *p1, *_p1, *dest;