[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57649] trunk/blender: set newline to native
Campbell Barton
ideasman42 at gmail.com
Sat Jun 22 12:49:52 CEST 2013
Revision: 57649
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57649
Author: campbellbarton
Date: 2013-06-22 10:49:52 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
set newline to native
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/shaders/node_toon_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl
trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl
trunk/blender/intern/cycles/kernel/svm/svm_wavelength.h
trunk/blender/intern/cycles/kernel/svm/svm_wireframe.h
trunk/blender/release/scripts/templates_osl/ramp_closure.osl
trunk/blender/release/scripts/templates_osl/temperature_to_rgb.osl
trunk/blender/release/scripts/templates_osl/wavelength_to_rgb.osl
trunk/blender/release/scripts/templates_osl/westin_closure.osl
Property Changed:
----------------
trunk/blender/intern/cycles/kernel/shaders/node_toon_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl
trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl
trunk/blender/intern/cycles/kernel/svm/svm_wavelength.h
trunk/blender/intern/cycles/kernel/svm/svm_wireframe.h
trunk/blender/release/scripts/templates_osl/ramp_closure.osl
trunk/blender/release/scripts/templates_osl/temperature_to_rgb.osl
trunk/blender/release/scripts/templates_osl/wavelength_to_rgb.osl
trunk/blender/release/scripts/templates_osl/westin_closure.osl
Modified: trunk/blender/intern/cycles/kernel/shaders/node_toon_bsdf.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_toon_bsdf.osl 2013-06-22 10:39:39 UTC (rev 57648)
+++ trunk/blender/intern/cycles/kernel/shaders/node_toon_bsdf.osl 2013-06-22 10:49:52 UTC (rev 57649)
@@ -1,34 +1,34 @@
-/*
- * Copyright 2013, Blender Foundation.
- *
- * 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.
- */
-
-#include "stdosl.h"
-
-shader node_toon_bsdf(
- color Color = 0.8,
- string component = "Diffuse",
- float Size = 0.5,
- float Smooth = 0.0,
- normal Normal = N,
- output closure color BSDF = 0)
-{
- if (component == "Diffuse")
- BSDF = Color * diffuse_toon(Normal, Size, Smooth);
- else if (component == "Glossy")
- BSDF = Color * glossy_toon(Normal, Size, Smooth);
-}
-
+/*
+ * Copyright 2013, Blender Foundation.
+ *
+ * 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.
+ */
+
+#include "stdosl.h"
+
+shader node_toon_bsdf(
+ color Color = 0.8,
+ string component = "Diffuse",
+ float Size = 0.5,
+ float Smooth = 0.0,
+ normal Normal = N,
+ output closure color BSDF = 0)
+{
+ if (component == "Diffuse")
+ BSDF = Color * diffuse_toon(Normal, Size, Smooth);
+ else if (component == "Glossy")
+ BSDF = Color * glossy_toon(Normal, Size, Smooth);
+}
+
Property changes on: trunk/blender/intern/cycles/kernel/shaders/node_toon_bsdf.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl 2013-06-22 10:39:39 UTC (rev 57648)
+++ trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl 2013-06-22 10:49:52 UTC (rev 57649)
@@ -1,27 +1,27 @@
-/*
- * Copyright 2013, Blender Foundation.
- *
- * 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.
- */
-
-#include "stdosl.h"
-
-shader node_wavelength(
- float Wavelength = 500.0,
- output color Color = 0.0)
-{
- Color = wavelength_color(Wavelength);
-}
-
+/*
+ * Copyright 2013, Blender Foundation.
+ *
+ * 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.
+ */
+
+#include "stdosl.h"
+
+shader node_wavelength(
+ float Wavelength = 500.0,
+ output color Color = 0.0)
+{
+ Color = wavelength_color(Wavelength);
+}
+
Property changes on: trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl 2013-06-22 10:39:39 UTC (rev 57648)
+++ trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl 2013-06-22 10:49:52 UTC (rev 57649)
@@ -1,29 +1,29 @@
-/*
- * Copyright 2013, Blender Foundation.
- *
- * 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.
- */
-
-#include "stdosl.h"
-#include "oslutil.h"
-
-shader node_wireframe(
- int use_pixel_size = 0,
- float Size = 0.01,
- output float Fac = 0.0)
-{
- Fac = wireframe("triangles", Size, use_pixel_size);
-}
-
+/*
+ * Copyright 2013, Blender Foundation.
+ *
+ * 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.
+ */
+
+#include "stdosl.h"
+#include "oslutil.h"
+
+shader node_wireframe(
+ int use_pixel_size = 0,
+ float Size = 0.01,
+ output float Fac = 0.0)
+{
+ Fac = wireframe("triangles", Size, use_pixel_size);
+}
+
Property changes on: trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/intern/cycles/kernel/svm/svm_wavelength.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_wavelength.h 2013-06-22 10:39:39 UTC (rev 57648)
+++ trunk/blender/intern/cycles/kernel/svm/svm_wavelength.h 2013-06-22 10:49:52 UTC (rev 57649)
@@ -1,100 +1,100 @@
-/*
- * Adapted from Open Shading Language with this license:
- *
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
- * All Rights Reserved.
- *
- * Modifications Copyright 2013, Blender Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Sony Pictures Imageworks nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-CCL_NAMESPACE_BEGIN
-
-/* Wavelength to RGB */
-
-__device void svm_node_wavelength(ShaderData *sd, float *stack, uint wavelength, uint color_out)
-{
- // CIE colour matching functions xBar, yBar, and zBar for
- // wavelengths from 380 through 780 nanometers, every 5
- // nanometers. For a wavelength lambda in this range:
- // cie_colour_match[(lambda - 380) / 5][0] = xBar
- // cie_colour_match[(lambda - 380) / 5][1] = yBar
- // cie_colour_match[(lambda - 380) / 5][2] = zBar
- const float cie_colour_match[81][3] = {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list