Revision: 57648
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57648
Author: campbellbarton
Date: 2013-06-22 10:39:39 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
set native line endings
Modified Paths:
--------------
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_wavelength.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_wireframe.c
Property Changed:
----------------
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_wavelength.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_wireframe.c
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
2013-06-22 09:04:33 UTC (rev 57647)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
2013-06-22 10:39:39 UTC (rev 57648)
@@ -1,67 +1,67 @@
-/*
- * ***** 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) 2005 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include "../node_shader_util.h"
-
-/* **************** OUTPUT ******************** */
-
-static bNodeSocketTemplate sh_node_bsdf_toon_in[] = {
- { SOCK_RGBA, 1, N_("Color"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f,
1.0f},
- { SOCK_FLOAT, 1, N_("Size"), 0.5f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
- { SOCK_FLOAT, 1, N_("Smooth"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
1.0f},
- { SOCK_VECTOR, 1, N_("Normal"), 0.0f, 0.0f, 0.0f, 1.0f, -1.0f,
1.0f, PROP_NONE, SOCK_HIDE_VALUE},
- { -1, 0, "" }
-};
-
-static bNodeSocketTemplate sh_node_bsdf_toon_out[] = {
- { SOCK_SHADER, 0, N_("BSDF")},
- { -1, 0, "" }
-};
-
-static int node_shader_gpu_bsdf_toon(GPUMaterial *mat, bNode *UNUSED(node),
bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
-{
- if (!in[3].link)
- in[3].link = GPU_builtin(GPU_VIEW_NORMAL);
-
- return GPU_stack_link(mat, "node_bsdf_toon", in, out);
-}
-
-/* node type definition */
-void register_node_type_sh_bsdf_toon(void)
-{
- static bNodeType ntype;
-
- sh_node_type_base(&ntype, SH_NODE_BSDF_TOON, "Toon BSDF",
NODE_CLASS_SHADER, 0);
- node_type_compatibility(&ntype, NODE_NEW_SHADING);
- node_type_socket_templates(&ntype, sh_node_bsdf_toon_in,
sh_node_bsdf_toon_out);
- node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
- node_type_init(&ntype, NULL);
- node_type_storage(&ntype, "", NULL, NULL);
- node_type_gpu(&ntype, node_shader_gpu_bsdf_toon);
-
- nodeRegisterType(&ntype);
-}
+/*
+ * ***** 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) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../node_shader_util.h"
+
+/* **************** OUTPUT ******************** */
+
+static bNodeSocketTemplate sh_node_bsdf_toon_in[] = {
+ { SOCK_RGBA, 1, N_("Color"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f,
1.0f},
+ { SOCK_FLOAT, 1, N_("Size"), 0.5f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_FLOAT, 1, N_("Smooth"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
1.0f},
+ { SOCK_VECTOR, 1, N_("Normal"), 0.0f, 0.0f, 0.0f, 1.0f, -1.0f,
1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+ { -1, 0, "" }
+};
+
+static bNodeSocketTemplate sh_node_bsdf_toon_out[] = {
+ { SOCK_SHADER, 0, N_("BSDF")},
+ { -1, 0, "" }
+};
+
+static int node_shader_gpu_bsdf_toon(GPUMaterial *mat, bNode *UNUSED(node),
bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
+{
+ if (!in[3].link)
+ in[3].link = GPU_builtin(GPU_VIEW_NORMAL);
+
+ return GPU_stack_link(mat, "node_bsdf_toon", in, out);
+}
+
+/* node type definition */
+void register_node_type_sh_bsdf_toon(void)
+{
+ static bNodeType ntype;
+
+ sh_node_type_base(&ntype, SH_NODE_BSDF_TOON, "Toon BSDF",
NODE_CLASS_SHADER, 0);
+ node_type_compatibility(&ntype, NODE_NEW_SHADING);
+ node_type_socket_templates(&ntype, sh_node_bsdf_toon_in,
sh_node_bsdf_toon_out);
+ node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
+ node_type_init(&ntype, NULL);
+ node_type_storage(&ntype, "", NULL, NULL);
+ node_type_gpu(&ntype, node_shader_gpu_bsdf_toon);
+
+ nodeRegisterType(&ntype);
+}
Property changes on:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
___________________________________________________________________
Added: svn:eol-style
+ native
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_wavelength.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_wavelength.c
2013-06-22 09:04:33 UTC (rev 57647)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_wavelength.c
2013-06-22 10:39:39 UTC (rev 57648)
@@ -1,54 +1,54 @@
-/*
- * ***** 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) 2005 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include "../node_shader_util.h"
-
-/* **************** Wavelength ******************** */
-static bNodeSocketTemplate sh_node_wavelength_in[] = {
- { SOCK_FLOAT, 1, N_("Wavelength"), 500.0f, 0.0f, 0.0f,
0.0f, 380.0f, 780.0f},
- { -1, 0, "" }
-};
-
-static bNodeSocketTemplate sh_node_wavelength_out[] = {
- { SOCK_RGBA, 0, N_("Color")},
- { -1, 0, "" }
-};
-
-/* node type definition */
-void register_node_type_sh_wavelength(void)
-{
- static bNodeType ntype;
-
- sh_node_type_base(&ntype, SH_NODE_WAVELENGTH, "Wavelength",
NODE_CLASS_CONVERTOR, 0);
- node_type_compatibility(&ntype, NODE_NEW_SHADING);
- node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
- node_type_socket_templates(&ntype, sh_node_wavelength_in,
sh_node_wavelength_out);
- node_type_init(&ntype, NULL);
- node_type_storage(&ntype, "", NULL, NULL);
-
- nodeRegisterType(&ntype);
-}
+/*
+ * ***** 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) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../node_shader_util.h"
+
+/* **************** Wavelength ******************** */
+static bNodeSocketTemplate sh_node_wavelength_in[] = {
+ { SOCK_FLOAT, 1, N_("Wavelength"), 500.0f, 0.0f, 0.0f,
0.0f, 380.0f, 780.0f},
+ { -1, 0, "" }
+};
+
+static bNodeSocketTemplate sh_node_wavelength_out[] = {
+ { SOCK_RGBA, 0, N_("Color")},
+ { -1, 0, "" }
+};
+
+/* node type definition */
+void register_node_type_sh_wavelength(void)
+{
+ static bNodeType ntype;
+
+ sh_node_type_base(&ntype, SH_NODE_WAVELENGTH, "Wavelength",
NODE_CLASS_CONVERTOR, 0);
+ node_type_compatibility(&ntype, NODE_NEW_SHADING);
+ node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
+ node_type_socket_templates(&ntype, sh_node_wavelength_in,
sh_node_wavelength_out);
+ node_type_init(&ntype, NULL);
+ node_type_storage(&ntype, "", NULL, NULL);
+
+ nodeRegisterType(&ntype);
+}
Property changes on:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_wavelength.c
___________________________________________________________________
Added: svn:eol-style
+ native
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_wireframe.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_wireframe.c
2013-06-22 09:04:33 UTC (rev 57647)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_wireframe.c
2013-06-22 10:39:39 UTC (rev 57648)
@@ -1,53 +1,53 @@
-/*
- * ***** 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,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
