[Bf-blender-cvs] [d918217d35b] blender2.7: OSL: remove fresnel template that was not public domain.

[Brecht Van Lommel]

Commit: d918217d35b687f174711d9ae35b8270909f1e28
Author: Brecht Van Lommel
Date:   Mon Jan 28 11:51:24 2019 +0100
Branches: blender2.7
https://developer.blender.org/rBd918217d35b687f174711d9ae35b8270909f1e28

OSL: remove fresnel template that was not public domain.

Convention is to only have public domain code templates. Also fixes wrong
license header in Cycles.

===================================================================

M	intern/cycles/kernel/shaders/node_fresnel.h
D	release/scripts/templates_osl/fresnel_conductive.osl

===================================================================

diff --git a/intern/cycles/kernel/shaders/node_fresnel.h b/intern/cycles/kernel/shaders/node_fresnel.h
index fcb0efa8445..40793479d8a 100644
--- a/intern/cycles/kernel/shaders/node_fresnel.h
+++ b/intern/cycles/kernel/shaders/node_fresnel.h
@@ -1,17 +1,33 @@
 /*
- * Copyright 2011-2013 Blender Foundation
+ * Adapted from Open Shading Language with this license:
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Modifications Copyright 2011, Blender Foundation.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 float fresnel_dielectric_cos(float cosi, float eta)
diff --git a/release/scripts/templates_osl/fresnel_conductive.osl b/release/scripts/templates_osl/fresnel_conductive.osl
deleted file mode 100644
index 6de0692bffe..00000000000
--- a/release/scripts/templates_osl/fresnel_conductive.osl
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011-2014 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-color fresnel_conductor(float cosi, color eta, color k)
-{
-	color cosi2 = color(cosi * cosi);
-	color one = color(1, 1, 1);
-	color tmp_f = eta * eta + k * k;
-	color tmp = tmp_f * cosi2;
-	color Rparl2 = (tmp - (2.0 * eta * cosi) + one) /
-	               (tmp + (2.0 * eta * cosi) + one);
-	color Rperp2 = (tmp_f - (2.0 * eta * cosi) + cosi2) /
-	               (tmp_f + (2.0 * eta * cosi) + cosi2);
-	return (Rparl2 + Rperp2) * 0.5;
-}
-
-shader node_fresnel_conductive(
-	color n = color(0.084136, 0.410708, 1.472421),
-	color k = color(4.018579, 2.363371, 1.607574),
-	normal Normal = N,
-	output color Color = color(0.8, 0.8, 0.8))
-{
-	float cosi = dot(I, Normal);
-	Color = fresnel_conductor(cosi, n, k);
-}