[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57044] trunk/blender/source/blender/nodes : style cleanup: nodes

Campbell Barton ideasman42 at gmail.com
Mon May 27 09:57:18 CEST 2013


Revision: 57044
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57044
Author:   campbellbarton
Date:     2013-05-27 07:57:17 +0000 (Mon, 27 May 2013)
Log Message:
-----------
style cleanup: nodes

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_crop.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_despeckle.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_gamma.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_levels.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_texture.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    trunk/blender/source/blender/nodes/shader/node_shader_tree.c
    trunk/blender/source/blender/nodes/shader/node_shader_util.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_camera.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_curves.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_geometry.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_invert.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_material.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_normal.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_output.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_rgb.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_value.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_checker.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_image.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_proc.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_rotate.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_valToNor.c

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c	2013-05-27 06:06:35 UTC (rev 57043)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c	2013-05-27 07:57:17 UTC (rev 57044)
@@ -45,7 +45,7 @@
 
 static void node_alphaover_init(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage= MEM_callocN(sizeof(NodeTwoFloats), "NodeTwoFloats");
+	node->storage = MEM_callocN(sizeof(NodeTwoFloats), "NodeTwoFloats");
 }
 
 void register_node_type_cmp_alphaover(void)

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehblur.c	2013-05-27 06:06:35 UTC (rev 57043)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehblur.c	2013-05-27 07:57:17 UTC (rev 57044)
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehimage.c	2013-05-27 06:06:35 UTC (rev 57043)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehimage.c	2013-05-27 07:57:17 UTC (rev 57044)
@@ -1,32 +1,30 @@
 /*
-* $Id$
-*
-* ***** BEGIN GPL LICENSE BLOCK *****
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version. 
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-* 
-* The Original Code is Copyright (C) 2006 Blender Foundation.
-* All rights reserved.
-* 
-* The Original Code is: all of this file.
-* 
-* Contributor(s): none yet.
-* 
-* ***** END GPL LICENSE BLOCK *****
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2006 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
 
-*/
+ */
 
 /** \file blender/nodes/composite/nodes/node_composite_bokehimage.c
  *  \ingroup cmpnodes
@@ -44,7 +42,7 @@
 
 static void node_composit_init_bokehimage(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeBokehImage * data = MEM_callocN(sizeof(NodeBokehImage), "NodeBokehImage");
+	NodeBokehImage *data = MEM_callocN(sizeof(NodeBokehImage), "NodeBokehImage");
 	data->angle = 0.0f;
 	data->flaps = 5;
 	data->rounding = 0.0f;
@@ -57,7 +55,7 @@
 {
 	static bNodeType ntype;
 	
-	cmp_node_type_base(&ntype, CMP_NODE_BOKEHIMAGE, "Bokeh Image", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_BOKEHIMAGE, "Bokeh Image", NODE_CLASS_INPUT, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, NULL, cmp_node_bokehimage_out);
 	node_type_init(&ntype, node_composit_init_bokehimage);
 	node_type_storage(&ntype, "NodeBokehImage", node_free_standard_storage, node_copy_standard_storage);

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c	2013-05-27 06:06:35 UTC (rev 57043)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c	2013-05-27 07:57:17 UTC (rev 57044)
@@ -23,9 +23,8 @@
  * Contributor(s): none yet.
  * 
  * ***** END GPL LICENSE BLOCK *****
+ */
 
-*/
-
 /** \file blender/nodes/composite/nodes/node_composite_brightness.c
  *  \ingroup cmpnodes
  */

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c	2013-05-27 06:06:35 UTC (rev 57043)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c	2013-05-27 07:57:17 UTC (rev 57044)
@@ -47,24 +47,24 @@
 
 static void node_composit_init_channel_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage=c;
-	c->t1= 1.0f;
-	c->t2= 0.0f;
-	c->t3= 0.0f;
-	c->fsize= 0.0f;
-	c->fstrength= 0.0f;
-	c->algorithm=1; /*max channel limiting */
-	c->channel=1; /* limit by red */
-	node->custom1= 1; /* RGB channel */
-	node->custom2= 2; /* Green Channel */
+	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+	node->storage = c;
+	c->t1 = 1.0f;
+	c->t2 = 0.0f;
+	c->t3 = 0.0f;
+	c->fsize = 0.0f;
+	c->fstrength = 0.0f;
+	c->algorithm = 1; /*max channel limiting */
+	c->channel = 1; /* limit by red */
+	node->custom1 = 1; /* RGB channel */
+	node->custom2 = 2; /* Green Channel */
 }
 
 void register_node_type_cmp_channel_matte(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CHANNEL_MATTE, "Channel Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_CHANNEL_MATTE, "Channel Key", NODE_CLASS_MATTE, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_channel_matte_in, cmp_node_channel_matte_out);
 	node_type_init(&ntype, node_composit_init_channel_matte);
 	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c	2013-05-27 06:06:35 UTC (rev 57043)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c	2013-05-27 07:57:17 UTC (rev 57044)
@@ -47,20 +47,20 @@
 
 static void node_composit_init_chroma_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage= c;
-	c->t1= DEG2RADF(30.0f);
-	c->t2= DEG2RADF(10.0f);
-	c->t3= 0.0f;
-	c->fsize= 0.0f;
-	c->fstrength= 1.0f;
+	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+	node->storage = c;
+	c->t1 = DEG2RADF(30.0f);
+	c->t2 = DEG2RADF(10.0f);
+	c->t3 = 0.0f;
+	c->fsize = 0.0f;
+	c->fstrength = 1.0f;
 }
 
 void register_node_type_cmp_chroma_matte(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CHROMA_MATTE, "Chroma Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_CHROMA_MATTE, "Chroma Key", NODE_CLASS_MATTE, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_chroma_in, cmp_node_chroma_out);
 	node_type_init(&ntype, node_composit_init_chroma_matte);
 	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c	2013-05-27 06:06:35 UTC (rev 57043)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c	2013-05-27 07:57:17 UTC (rev 57044)
@@ -47,20 +47,20 @@
 
 static void node_composit_init_color_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node color");
-	node->storage= c;
-	c->t1= 0.01f;
-	c->t2= 0.1f;
-	c->t3= 0.1f;
-	c->fsize= 0.0f;
-	c->fstrength= 1.0f;
+	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node color");
+	node->storage = c;
+	c->t1 = 0.01f;
+	c->t2 = 0.1f;
+	c->t3 = 0.1f;
+	c->fsize = 0.0f;
+	c->fstrength = 1.0f;
 }
 
 void register_node_type_cmp_color_matte(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COLOR_MATTE, "Color Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_COLOR_MATTE, "Color Key", NODE_CLASS_MATTE, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_color_in, cmp_node_color_out);
 	node_type_init(&ntype, node_composit_init_color_matte);
 	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c	2013-05-27 06:06:35 UTC (rev 57043)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c	2013-05-27 07:57:17 UTC (rev 57044)
@@ -45,13 +45,13 @@
 
 static void node_composit_init_color_spill(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeColorspill *ncs= MEM_callocN(sizeof(NodeColorspill), "node colorspill");
-	node->storage=ncs;
-	node->custom1= 2; /* green channel */
-	node->custom2= 0; /* simple limit algo*/
-	ncs->limchan= 0;  /* limit by red */

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list