From 9cfc7967ddf0368e9a9a3e22446ef341e472a2a1 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 11 Feb 2022 13:53:21 +0100 Subject: Cycles: use SPDX license headers * Replace license text in headers with SPDX identifiers. * Remove specific license info from outdated readme.txt, instead leave details to the source files. * Add list of SPDX license identifiers used, and corresponding license texts. * Update copyright dates while we're at it. Ref D14069, T95597 --- intern/cycles/bvh/CMakeLists.txt | 2 +- intern/cycles/bvh/binning.cpp | 17 ++--------------- intern/cycles/bvh/binning.h | 17 ++--------------- intern/cycles/bvh/build.cpp | 17 ++--------------- intern/cycles/bvh/build.h | 17 ++--------------- intern/cycles/bvh/bvh.cpp | 17 ++--------------- intern/cycles/bvh/bvh.h | 17 ++--------------- intern/cycles/bvh/bvh2.cpp | 17 ++--------------- intern/cycles/bvh/bvh2.h | 17 ++--------------- intern/cycles/bvh/embree.cpp | 17 ++--------------- intern/cycles/bvh/embree.h | 17 ++--------------- intern/cycles/bvh/metal.h | 17 ++--------------- intern/cycles/bvh/metal.mm | 17 ++--------------- intern/cycles/bvh/multi.cpp | 17 ++--------------- intern/cycles/bvh/multi.h | 17 ++--------------- intern/cycles/bvh/node.cpp | 17 ++--------------- intern/cycles/bvh/node.h | 17 ++--------------- intern/cycles/bvh/optix.cpp | 17 ++--------------- intern/cycles/bvh/optix.h | 17 ++--------------- intern/cycles/bvh/params.h | 17 ++--------------- intern/cycles/bvh/sort.cpp | 17 ++--------------- intern/cycles/bvh/sort.h | 17 ++--------------- intern/cycles/bvh/split.cpp | 17 ++--------------- intern/cycles/bvh/split.h | 17 ++--------------- intern/cycles/bvh/unaligned.cpp | 17 ++--------------- intern/cycles/bvh/unaligned.h | 17 ++--------------- 26 files changed, 51 insertions(+), 376 deletions(-) (limited to 'intern/cycles/bvh') diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt index f2ef35d3609..0c3499df455 100644 --- a/intern/cycles/bvh/CMakeLists.txt +++ b/intern/cycles/bvh/CMakeLists.txt @@ -1,5 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -# Copyright 2011-2020 Blender Foundation +# Copyright 2011-2022 Blender Foundation set(INC .. diff --git a/intern/cycles/bvh/binning.cpp b/intern/cycles/bvh/binning.cpp index da591ef5cea..b04fc069c54 100644 --- a/intern/cycles/bvh/binning.cpp +++ b/intern/cycles/bvh/binning.cpp @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2011 Intel Corporation - * Modifications Copyright 2012, 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. - */ + * Modifications Copyright 2012-2022 Blender Foundation. */ //#define __KERNEL_SSE__ diff --git a/intern/cycles/bvh/binning.h b/intern/cycles/bvh/binning.h index 876500ec540..50420da391b 100644 --- a/intern/cycles/bvh/binning.h +++ b/intern/cycles/bvh/binning.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2011 Intel Corporation - * Modifications Copyright 2012, 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. - */ + * Modifications Copyright 2012-2022 Blender Foundation. */ #ifndef __BVH_BINNING_H__ #define __BVH_BINNING_H__ diff --git a/intern/cycles/bvh/build.cpp b/intern/cycles/bvh/build.cpp index 082041f5ed2..79e9b800690 100644 --- a/intern/cycles/bvh/build.cpp +++ b/intern/cycles/bvh/build.cpp @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #include "bvh/build.h" diff --git a/intern/cycles/bvh/build.h b/intern/cycles/bvh/build.h index 5b9bb59d9f8..af9dd4f5cc6 100644 --- a/intern/cycles/bvh/build.h +++ b/intern/cycles/bvh/build.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #ifndef __BVH_BUILD_H__ #define __BVH_BUILD_H__ diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp index 703639e29f3..2a7bbfe968b 100644 --- a/intern/cycles/bvh/bvh.cpp +++ b/intern/cycles/bvh/bvh.cpp @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #include "bvh/bvh.h" diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h index c1f55ee917e..be390f8a673 100644 --- a/intern/cycles/bvh/bvh.h +++ b/intern/cycles/bvh/bvh.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #ifndef __BVH_H__ #define __BVH_H__ diff --git a/intern/cycles/bvh/bvh2.cpp b/intern/cycles/bvh/bvh2.cpp index f1ea43da1d9..cd1d51d19ec 100644 --- a/intern/cycles/bvh/bvh2.cpp +++ b/intern/cycles/bvh/bvh2.cpp @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #include "bvh/bvh2.h" diff --git a/intern/cycles/bvh/bvh2.h b/intern/cycles/bvh/bvh2.h index 7937288f271..78837edcb2c 100644 --- a/intern/cycles/bvh/bvh2.h +++ b/intern/cycles/bvh/bvh2.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #ifndef __BVH2_H__ #define __BVH2_H__ diff --git a/intern/cycles/bvh/embree.cpp b/intern/cycles/bvh/embree.cpp index 731fef52063..0fc71f49ce3 100644 --- a/intern/cycles/bvh/embree.cpp +++ b/intern/cycles/bvh/embree.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2018, 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. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2018-2022 Blender Foundation. */ /* This class implements a ray accelerator for Cycles using Intel's Embree library. * It supports triangles, curves, object and deformation blur and instancing. diff --git a/intern/cycles/bvh/embree.h b/intern/cycles/bvh/embree.h index 3b30b2bbcf7..1e8401bfb7c 100644 --- a/intern/cycles/bvh/embree.h +++ b/intern/cycles/bvh/embree.h @@ -1,18 +1,5 @@ -/* - * Copyright 2018, 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. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2018-2022 Blender Foundation. */ #ifndef __BVH_EMBREE_H__ #define __BVH_EMBREE_H__ diff --git a/intern/cycles/bvh/metal.h b/intern/cycles/bvh/metal.h index 8de07927e61..b136a2a1a67 100644 --- a/intern/cycles/bvh/metal.h +++ b/intern/cycles/bvh/metal.h @@ -1,18 +1,5 @@ -/* - * Copyright 2021 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. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2021-2022 Blender Foundation */ #ifndef __BVH_METAL_H__ #define __BVH_METAL_H__ diff --git a/intern/cycles/bvh/metal.mm b/intern/cycles/bvh/metal.mm index 90a52012f12..a785dcab60d 100644 --- a/intern/cycles/bvh/metal.mm +++ b/intern/cycles/bvh/metal.mm @@ -1,18 +1,5 @@ -/* - * Copyright 2021 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. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2021-2022 Blender Foundation */ #ifdef WITH_METAL diff --git a/intern/cycles/bvh/multi.cpp b/intern/cycles/bvh/multi.cpp index db0ff5c7847..7211720b56b 100644 --- a/intern/cycles/bvh/multi.cpp +++ b/intern/cycles/bvh/multi.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2020, 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. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2020-2022 Blender Foundation. */ #include "bvh/multi.h" diff --git a/intern/cycles/bvh/multi.h b/intern/cycles/bvh/multi.h index 88a459605c3..824899f3101 100644 --- a/intern/cycles/bvh/multi.h +++ b/intern/cycles/bvh/multi.h @@ -1,18 +1,5 @@ -/* - * Copyright 2020, 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. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2020-2022 Blender Foundation. */ #ifndef __BVH_MULTI_H__ #define __BVH_MULTI_H__ diff --git a/intern/cycles/bvh/node.cpp b/intern/cycles/bvh/node.cpp index 60b0843bde2..c70f950a827 100644 --- a/intern/cycles/bvh/node.cpp +++ b/intern/cycles/bvh/node.cpp @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #include "bvh/node.h" diff --git a/intern/cycles/bvh/node.h b/intern/cycles/bvh/node.h index 1fd9efdb75e..29460f5a753 100644 --- a/intern/cycles/bvh/node.h +++ b/intern/cycles/bvh/node.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #ifndef __BVH_NODE_H__ #define __BVH_NODE_H__ diff --git a/intern/cycles/bvh/optix.cpp b/intern/cycles/bvh/optix.cpp index 671e1a42a31..b2c1c9a9702 100644 --- a/intern/cycles/bvh/optix.cpp +++ b/intern/cycles/bvh/optix.cpp @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Copyright 2019, NVIDIA Corporation. - * Copyright 2019, 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. - */ + * Copyright 2019-2022 Blender Foundation. */ #ifdef WITH_OPTIX diff --git a/intern/cycles/bvh/optix.h b/intern/cycles/bvh/optix.h index cb855d786bf..db2d8bb6d5b 100644 --- a/intern/cycles/bvh/optix.h +++ b/intern/cycles/bvh/optix.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Copyright 2019, NVIDIA Corporation. - * Copyright 2019, 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. - */ + * Copyright 2019-2022 Blender Foundation. */ #ifndef __BVH_OPTIX_H__ #define __BVH_OPTIX_H__ diff --git a/intern/cycles/bvh/params.h b/intern/cycles/bvh/params.h index 61fa5484ce0..41d851ee687 100644 --- a/intern/cycles/bvh/params.h +++ b/intern/cycles/bvh/params.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #ifndef __BVH_PARAMS_H__ #define __BVH_PARAMS_H__ diff --git a/intern/cycles/bvh/sort.cpp b/intern/cycles/bvh/sort.cpp index a9975ce6bb2..fc4ef28596d 100644 --- a/intern/cycles/bvh/sort.cpp +++ b/intern/cycles/bvh/sort.cpp @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #include "bvh/sort.h" diff --git a/intern/cycles/bvh/sort.h b/intern/cycles/bvh/sort.h index 936401d8607..3081e821593 100644 --- a/intern/cycles/bvh/sort.h +++ b/intern/cycles/bvh/sort.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #ifndef __BVH_SORT_H__ #define __BVH_SORT_H__ diff --git a/intern/cycles/bvh/split.cpp b/intern/cycles/bvh/split.cpp index e126b6f18bc..f80305c149a 100644 --- a/intern/cycles/bvh/split.cpp +++ b/intern/cycles/bvh/split.cpp @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #include "bvh/split.h" diff --git a/intern/cycles/bvh/split.h b/intern/cycles/bvh/split.h index 92953c40040..9f60fa3dfa7 100644 --- a/intern/cycles/bvh/split.h +++ b/intern/cycles/bvh/split.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Adapted from code copyright 2009-2010 NVIDIA Corporation - * Modifications Copyright 2011, 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. - */ + * Modifications Copyright 2011-2022 Blender Foundation. */ #ifndef __BVH_SPLIT_H__ #define __BVH_SPLIT_H__ diff --git a/intern/cycles/bvh/unaligned.cpp b/intern/cycles/bvh/unaligned.cpp index a8db6efb597..add1e885379 100644 --- a/intern/cycles/bvh/unaligned.cpp +++ b/intern/cycles/bvh/unaligned.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2016 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. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "bvh/unaligned.h" diff --git a/intern/cycles/bvh/unaligned.h b/intern/cycles/bvh/unaligned.h index 33e584ea8ed..d905bc92765 100644 --- a/intern/cycles/bvh/unaligned.h +++ b/intern/cycles/bvh/unaligned.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2016 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. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __BVH_UNALIGNED_H__ #define __BVH_UNALIGNED_H__ -- cgit v1.2.3