style cleanup: comments

14 files changed, 46 insertions, 43 deletions

diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c
index b886ee80d55..72112180bc8 100644
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@ -221,8 +221,8 @@ static void local_merge(bNodeTree *localtree, bNodeTree *ntree)
 			}
 			else if (lnode->type==CMP_NODE_MOVIEDISTORTION) {
 				/* special case for distortion node: distortion context is allocating in exec function
-				   and to achive much better performance on further calls this context should be
-				   copied back to original node */
+				 * and to achive much better performance on further calls this context should be
+				 * copied back to original node */
 				if (lnode->storage) {
 					if (lnode->new_node->storage)
 						BKE_tracking_distortion_free(lnode->new_node->storage);
diff --git a/source/blender/nodes/composite/node_composite_util.c b/source/blender/nodes/composite/node_composite_util.c
index f6011843b8a..98ded3ea3b3 100644
--- a/source/blender/nodes/composite/node_composite_util.c
+++ b/source/blender/nodes/composite/node_composite_util.c
@@ -872,8 +872,8 @@ static void FHT(fREAL* data, unsigned int M, unsigned int inverse)
 }
 //------------------------------------------------------------------------------
 /* 2D Fast Hartley Transform, Mx/My -> log2 of width/height,
-	nzp -> the row where zero pad data starts,
-	inverse -> see above */
+ * nzp -> the row where zero pad data starts,
+ * inverse -> see above */
 static void FHT2D(fREAL *data, unsigned int Mx, unsigned int My,
 		unsigned int nzp, unsigned int inverse)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
index 62e8138f5e1..0137093658c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
@@ -59,7 +59,7 @@ static bNodeSocketTemplate cmp_node_bilateralblur_out[] = {
      (c1[3] - c2[3]) * (c1[3] - c2[3]))
 
 /* this is the main kernel function for comparing color distances
-   and adding them weighted to the final color */
+ * and adding them weighted to the final color */
 #define KERNEL_ELEMENT_C3(k)                                                  \
     temp_color = src + deltas[k];                                             \
     ref_color = ref + deltas[k];                                              \
diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.c b/source/blender/nodes/composite/nodes/node_composite_blur.c
index 046623f5b26..fb163222781 100644
--- a/source/blender/nodes/composite/nodes/node_composite_blur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_blur.c
@@ -384,7 +384,7 @@ static void bokeh_single_image(bNode *node, CompBuf *new, CompBuf *img, float fa
 			float fi = (float)i / radxf;
 			float dist = sqrt(fj * fj + fi * fi);
 
-			//*dgauss= hexagon_filter(fi, fj);
+			// *dgauss= hexagon_filter(fi, fj);
 			*dgauss = RE_filter_value(nbd->filtertype, dist);
 
 			val += *dgauss;
diff --git a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
index 7c6b4ad1f95..0c6ce79c51f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
@@ -26,8 +26,8 @@
  */
 
 /** \file blender/nodes/composite/nodes/node_composite_chromaMatte.c
-*  \ingroup cmpnodes
-*/
+ *  \ingroup cmpnodes
+ */
 
 
 #include "node_composite_util.h"
diff --git a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
index 0569f5c68ef..33e6de8ea6e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
@@ -26,8 +26,8 @@
  */
 
 /** \file blender/nodes/composite/nodes/node_composite_diffMatte.c
-*  \ingroup cmpnodes
-*/
+ *  \ingroup cmpnodes
+ */
 
 
 #include "node_composite_util.h"
diff --git a/source/blender/nodes/composite/nodes/node_composite_displace.c b/source/blender/nodes/composite/nodes/node_composite_displace.c
index c1a85a0071b..49cba801d5a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_displace.c
+++ b/source/blender/nodes/composite/nodes/node_composite_displace.c
@@ -126,7 +126,7 @@ static void do_displace(bNode *node, CompBuf *stackbuf, CompBuf *cbuf, CompBuf *
 	
 	
 /* simple method for reference, linear interpolation */
-/*	
+#if 0
 	int x, y;
 	float dx, dy;
 	float u, v;
@@ -147,7 +147,7 @@ static void do_displace(bNode *node, CompBuf *stackbuf, CompBuf *cbuf, CompBuf *
 			qd_setPixel(stackbuf, x, y, col);
 		}
 	}
-*/
+#endif
 }
 
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
index a456f45c57e..f365ee58f59 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
@@ -26,8 +26,8 @@
  */
 
 /** \file blender/nodes/composite/nodes/node_composite_distanceMatte.c
-*  \ingroup cmpnodes
-*/
+ *  \ingroup cmpnodes
+ */
 
 
 #include "node_composite_util.h"
@@ -139,9 +139,9 @@ static void do_chroma_distance_matte(bNode *node, float *out, float *in)
 static void node_composit_exec_distance_matte(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 {
 	/*
-	Loosely based on the Sequencer chroma key plug-in, but enhanced to work in other color spaces and
-	uses a different difference function (suggested in forums of vfxtalk.com).
-	*/
+	 * Loosely based on the Sequencer chroma key plug-in, but enhanced to work in other color spaces and
+	 * uses a different difference function (suggested in forums of vfxtalk.com).
+	 */
 	CompBuf *workbuf;
 	CompBuf *inbuf;
 	NodeChroma *c;
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index ba03a2697be..3060496bb9e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -368,9 +368,11 @@ static CompBuf *node_composit_get_image(RenderData *rd, Image *ima, ImageUser *i
 		stackbuf->malloc= alloc;
 	}
 	
-	/*code to respect the premul flag of images; I'm
-	  not sure if this is a good idea for multilayer images,
-	  since it never worked before for them.
+	/* code to respect the premul flag of images; I'm
+	 * not sure if this is a good idea for multilayer images,
+	 * since it never worked before for them.
+	 */
+#if 0
 	if (type==CB_RGBA && ima->flag & IMA_DO_PREMUL) {
 		//premul the image
 		int i;
@@ -382,7 +384,7 @@ static CompBuf *node_composit_get_image(RenderData *rd, Image *ima, ImageUser *i
 			pixel[2] *= pixel[3];
 		}
 	}
-	*/
+#endif
 	return stackbuf;
 }
 
@@ -481,8 +483,8 @@ static void node_composit_exec_image(void *data, bNode *node, bNodeStack **UNUSE
 					int i;
 					float *pixel;
 			
-					/*first duplicate stackbuf->rect, since it's just a pointer
-					  to the source imbuf, and we don't want to change that.*/
+					/* first duplicate stackbuf->rect, since it's just a pointer
+					 * to the source imbuf, and we don't want to change that.*/
 					stackbuf->rect = MEM_dupallocN(stackbuf->rect);
 					
 					/* since stackbuf now has allocated memory, rather than just a pointer,
diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.c b/source/blender/nodes/composite/nodes/node_composite_levels.c
index 0aeeb69210d..1952756d397 100644
--- a/source/blender/nodes/composite/nodes/node_composite_levels.c
+++ b/source/blender/nodes/composite/nodes/node_composite_levels.c
@@ -291,10 +291,11 @@ static void node_composit_exec_view_levels(void *data, bNode *node, bNodeStack *
 	mean=brightness_mean(node, in[0]->data);
 	std_dev=brightness_standard_deviation(node, in[0]->data, mean);
 
-	/*  Printf debuging ;) 
+	/*  Printf debuging ;) */
+#if 0
 	printf("Mean: %f\n", mean);
 	printf("Std Dev: %f\n", std_dev);
-	*/
+#endif
 
 	if (out[0]->hasoutput)
 			out[0]->vec[0]= mean;
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c
index c84436a84b7..1a11a7075b8 100644
--- a/source/blender/nodes/texture/node_texture_tree.c
+++ b/source/blender/nodes/texture/node_texture_tree.c
@@ -282,7 +282,7 @@ int ntreeTexExecTree(
 	if (texres->nor) retval |= TEX_NOR;
 	retval |= TEX_RGB;
 	/* confusing stuff; the texture output node sets this to NULL to indicate no normal socket was set
-	   however, the texture code checks this for other reasons (namely, a normal is required for material) */
+	 * however, the texture code checks this for other reasons (namely, a normal is required for material) */
 	texres->nor= nor;
 
 	return retval;
diff --git a/source/blender/nodes/texture/node_texture_util.c b/source/blender/nodes/texture/node_texture_util.c
index 28d03db1687..53f1aa82f60 100644
--- a/source/blender/nodes/texture/node_texture_util.c
+++ b/source/blender/nodes/texture/node_texture_util.c
@@ -31,20 +31,20 @@
 
  
 /*
-	HOW TEXTURE NODES WORK
-
-	In contrast to Shader nodes, which place a color into the output
-	stack when executed, Texture nodes place a TexDelegate* there. To
-	obtain a color value from this, a node further up the chain reads
-	the TexDelegate* from its input stack, and uses tex_call_delegate to
-	retrieve the color from the delegate.
- 
-	comments: (ton)
-
-	This system needs recode, a node system should rely on the stack, and 
-	callbacks for nodes only should evaluate own node, not recursively go
-	over other previous ones.
-*/
+ * HOW TEXTURE NODES WORK
+ *
+ * In contrast to Shader nodes, which place a color into the output
+ * stack when executed, Texture nodes place a TexDelegate* there. To
+ * obtain a color value from this, a node further up the chain reads
+ * the TexDelegate* from its input stack, and uses tex_call_delegate to
+ * retrieve the color from the delegate.
+ *
+ * comments: (ton)
+ *
+ * This system needs recode, a node system should rely on the stack, and
+ * callbacks for nodes only should evaluate own node, not recursively go
+ * over other previous ones.
+ */
 
 #include <assert.h>
 #include "node_texture_util.h"
diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h
index 0fe685996b1..7d8c4ce232c 100644
--- a/source/blender/nodes/texture/node_texture_util.h
+++ b/source/blender/nodes/texture/node_texture_util.h
@@ -97,7 +97,7 @@ typedef struct TexParams {
 	int osatex;
 
 	/* optional. we don't really want these here, but image
-	   textures need to do mapping & color correction */
+	 * textures need to do mapping & color correction */
 	ShadeInput *shi;
 	MTex *mtex;
 } TexParams;
diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.c b/source/blender/nodes/texture/nodes/node_texture_proc.c
index fe2082d1442..3b33383c73b 100644
--- a/source/blender/nodes/texture/nodes/node_texture_proc.c
+++ b/source/blender/nodes/texture/nodes/node_texture_proc.c
@@ -36,8 +36,8 @@
 #include "RE_shader_ext.h"
 
 /* 
-	In this file: wrappers to use procedural textures as nodes
-*/
+ * In this file: wrappers to use procedural textures as nodes
+ */
 
 
 static bNodeSocketTemplate outputs_both[]= {