[Bf-blender-cvs] [14dd207b759] master: License headers: use SPDX for remaining files in Cycles

[Campbell Barton]

Commit: 14dd207b759593b9b4ae2f720044397b7c52cccc
Author: Campbell Barton
Date:   Tue Feb 15 17:52:38 2022 +1100
Branches: master
https://developer.blender.org/rB14dd207b759593b9b4ae2f720044397b7c52cccc

License headers: use SPDX for remaining files in Cycles

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

M	intern/cycles/kernel/geom/patch.h
M	intern/cycles/subd/patch_table.cpp

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

diff --git a/intern/cycles/kernel/geom/patch.h b/intern/cycles/kernel/geom/patch.h
index 432618aa243..9a006baf7bf 100644
--- a/intern/cycles/kernel/geom/patch.h
+++ b/intern/cycles/kernel/geom/patch.h
@@ -1,27 +1,8 @@
-/*
- * Based on code from OpenSubdiv released under this license:
- *
- * Copyright 2013 Pixar
- *
- * Licensed under the Apache License, Version 2.0 (the "Apache License")
- * with the following modification; you may not use this file except in
- * compliance with the Apache License and the following modification to it:
- * Section 6. Trademarks. is deleted and replaced with:
- *
- * 6. Trademarks. This License does not grant permission to use the trade
- *   names, trademarks, service marks, or product names of the Licensor
- *   and its affiliates, except as required to comply with Section 4(c) of
- *   the License and to reproduce the content of the NOTICE file.
- *
- * You may obtain a copy of the Apache License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Apache License with the above modification is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the Apache License for the specific
- * language governing permissions and limitations under the Apache License.
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2013 Pixar. */
+
+/** \file
+ * Based on code from OpenSubdiv.
  */
 
 #pragma once
diff --git a/intern/cycles/subd/patch_table.cpp b/intern/cycles/subd/patch_table.cpp
index d215dfaa1dd..a2dff0d0889 100644
--- a/intern/cycles/subd/patch_table.cpp
+++ b/intern/cycles/subd/patch_table.cpp
@@ -1,27 +1,8 @@
-/*
- * Based on code from OpenSubdiv released under this license:
- *
- * Copyright 2014 DreamWorks Animation LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "Apache License")
- * with the following modification; you may not use this file except in
- * compliance with the Apache License and the following modification to it:
- * Section 6. Trademarks. is deleted and replaced with:
- *
- * 6. Trademarks. This License does not grant permission to use the trade
- *   names, trademarks, service marks, or product names of the Licensor
- *   and its affiliates, except as required to comply with Section 4(c) of
- *   the License and to reproduce the content of the NOTICE file.
- *
- * You may obtain a copy of the Apache License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Apache License with the above modification is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the Apache License for the specific
- * language governing permissions and limitations under the Apache License.
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2014 DreamWorks Animation LLC. */
+
+/** \file
+ * Based on code from OpenSubdiv.
  */
 
 #include "subd/patch_table.h"