[Bf-blender-cvs] [281ba8a0632] master: File headers: add missing copyright, add MIT to SPDX licenses
Campbell Barton
noreply at git.blender.org
Fri Feb 11 05:17:02 CET 2022
Commit: 281ba8a063250b3cf7051b3f52846a8e0b960aee
Author: Campbell Barton
Date: Fri Feb 11 14:56:03 2022 +1100
Branches: master
https://developer.blender.org/rB281ba8a063250b3cf7051b3f52846a8e0b960aee
File headers: add missing copyright, add MIT to SPDX licenses
===================================================================
M build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
M build_files/cmake/example_scripts/cmake_linux_install.sh
M doc/doxygen/doxygen.extern.h
M doc/doxygen/doxygen.intern.h
M doc/doxygen/doxygen.main.h
M doc/doxygen/doxygen.source.h
M doc/license/SPDX-license-identifiers.txt
M intern/libmv/bundle.sh
M intern/libmv/mkfiles.sh
M intern/locale/osx_user_locale.mm
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/blenlib/intern/serialize.cc
M source/blender/blenlib/tests/BLI_exception_safety_test_utils.hh
M source/blender/bmesh/tests/bmesh_core_test.cc
M source/blender/compositor/COM_precomp.h
M source/blender/compositor/intern/COM_MultiThreadedOperation.cc
M source/blender/compositor/operations/COM_OpenCLKernels.cl
M source/blender/draw/engines/image/shaders/infos/engine_image_info.hh
M source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh
M source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh
M source/blender/draw/engines/workbench/shaders/infos/workbench_effect_cavity_info.hh
M source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_info.hh
M source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_info.hh
M source/blender/draw/engines/workbench/shaders/infos/workbench_merge_infront_info.hh
M source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh
M source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_info.hh
M source/blender/draw/engines/workbench/shaders/infos/workbench_transparent_resolve_info.hh
M source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh
M source/blender/draw/engines/workbench/workbench_shader_shared.h
M source/blender/draw/intern/draw_shader_shared.h
M source/blender/draw/intern/shaders/draw_fullscreen_info.hh
M source/blender/draw/intern/shaders/draw_object_infos_info.hh
M source/blender/draw/intern/shaders/draw_view_info.hh
M source/blender/draw/intern/smaa_textures.c
M source/blender/draw/intern/smaa_textures.h
M source/blender/freestyle/FRS_precomp.h
M source/blender/gpu/shaders/infos/gpu_shader_2D_image_multi_rect_color_info.hh
M source/blender/gpu/tests/gpu_testing.hh
M source/blender/io/alembic/tests/abc_export_test.cc
M source/blender/io/alembic/tests/abc_matrix_test.cc
M source/blender/makesrna/rna_cleanup/rna_update.sh
M tests/gtests/testing/testing.h
===================================================================
diff --git a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
index 330038f022d..8b08b047eac 100644
--- a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
# Module to find OpenEXR.
#
# This module will first look into the directories defined by the variables:
diff --git a/build_files/cmake/example_scripts/cmake_linux_install.sh b/build_files/cmake/example_scripts/cmake_linux_install.sh
index 5599863ff81..0a58d13fb29 100755
--- a/build_files/cmake/example_scripts/cmake_linux_install.sh
+++ b/build_files/cmake/example_scripts/cmake_linux_install.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
# This shell script checks out and compiles blender, tested on ubuntu 10.04
# assumes you have dependencies installed already
@@ -7,7 +8,7 @@
# https://wiki.blender.org/wiki/Building_Blender/Linux/Generic_Distro/CMake
# grab blender
-mkdir ~/blender-git
+mkdir ~/blender-git
cd ~/blender-git
git clone http://git.blender.org/blender.git
diff --git a/doc/doxygen/doxygen.extern.h b/doc/doxygen/doxygen.extern.h
index 27b53ad24ab..228c568b44e 100644
--- a/doc/doxygen/doxygen.extern.h
+++ b/doc/doxygen/doxygen.extern.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
/** \defgroup extern External libraries
* \section externabout External libraries
* As with \ref intern these libraries are
diff --git a/doc/doxygen/doxygen.intern.h b/doc/doxygen/doxygen.intern.h
index 5dcb472b282..2b584e4a060 100644
--- a/doc/doxygen/doxygen.intern.h
+++ b/doc/doxygen/doxygen.intern.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
/** \defgroup intern Internal libraries
* \section internabout Internal libraries
* Blender comes with some of its dependencies
diff --git a/doc/doxygen/doxygen.main.h b/doc/doxygen/doxygen.main.h
index 0d7b5e38397..b1893a81e0a 100644
--- a/doc/doxygen/doxygen.main.h
+++ b/doc/doxygen/doxygen.main.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
/** \mainpage Blender
*
* \section intro Introduction
@@ -16,4 +18,7 @@
*/
/** \defgroup undoc Undocumented
- * \brief Modules and libraries that are still undocumented, or lacking proper integration into the doxygen system, are marked in this group. */
+ *
+ * \brief Modules and libraries that are still undocumented,
+ * or lacking proper integration into the doxygen system, are marked in this group.
+ */
diff --git a/doc/doxygen/doxygen.source.h b/doc/doxygen/doxygen.source.h
index 4e351c9cc04..834a33dd287 100644
--- a/doc/doxygen/doxygen.source.h
+++ b/doc/doxygen/doxygen.source.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/** \defgroup render Rendering
* \ingroup blender
diff --git a/doc/license/SPDX-license-identifiers.txt b/doc/license/SPDX-license-identifiers.txt
index 7f43ad3aab0..1e25d002fce 100644
--- a/doc/license/SPDX-license-identifiers.txt
+++ b/doc/license/SPDX-license-identifiers.txt
@@ -3,4 +3,5 @@ Corresponding SPDX license identifiers in the source code:
Apache-2.0 Apache-2-license.txt https://spdx.org/licenses/Apache-2.0.html
BSD-3-Clause BSD-3-Clause-license.txt https://spdx.org/licenses/BSD-3-Clause.html
GPL-2.0-or-later GPL-license.txt https://spdx.org/licenses/GPL-2.0-or-later.html
+MIT https://spdx.org/licenses/MIT.html
Zlib https://spdx.org/licenses/Zlib.html
diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh
index fecae324a0a..6808e244c05 100755
--- a/intern/libmv/bundle.sh
+++ b/intern/libmv/bundle.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
if [ "x$1" = "x--i-really-know-what-im-doing" ] ; then
echo Proceeding as requested by command line ...
diff --git a/intern/libmv/mkfiles.sh b/intern/libmv/mkfiles.sh
index 165b328f9aa..765dfbef88b 100755
--- a/intern/libmv/mkfiles.sh
+++ b/intern/libmv/mkfiles.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
find ./libmv/ -type f | sed -r 's/^\.\///' | sort > files.txt
find ./third_party/ -type f | \
diff --git a/intern/locale/osx_user_locale.mm b/intern/locale/osx_user_locale.mm
index 8776c658b52..92c9eb21605 100644
--- a/intern/locale/osx_user_locale.mm
+++ b/intern/locale/osx_user_locale.mm
@@ -1,3 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2012 Blender Foundation. All rights reserved. */
+
#include "boost_locale_wrapper.h"
/** \file
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 055a2e37c6c..292080ef629 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -1,4 +1,6 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+/**
* Generated by 'source/tools/utils/blender_theme_as_c.py'
*
* Do not hand edit this file!
diff --git a/source/blender/blenlib/intern/serialize.cc b/source/blender/blenlib/intern/serialize.cc
index 4e7203efe9b..d795e67a54e 100644
--- a/source/blender/blenlib/intern/serialize.cc
+++ b/source/blender/blenlib/intern/serialize.cc
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "BLI_serialize.hh"
#include "json.hpp"
diff --git a/source/blender/blenlib/tests/BLI_exception_safety_test_utils.hh b/source/blender/blenlib/tests/BLI_exception_safety_test_utils.hh
index 91270767a25..63943e48f0e 100644
--- a/source/blender/blenlib/tests/BLI_exception_safety_test_utils.hh
+++ b/source/blender/blenlib/tests/BLI_exception_safety_test_utils.hh
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
#include "BLI_hash.hh"
#include "BLI_utildefines.h"
#include "MEM_guardedalloc.h"
diff --git a/source/blender/bmesh/tests/bmesh_core_test.cc b/source/blender/bmesh/tests/bmesh_core_test.cc
index 3d6fabcbc2f..000e4cf92a2 100644
--- a/source/blender/bmesh/tests/bmesh_core_test.cc
+++ b/source/blender/bmesh/tests/bmesh_core_test.cc
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "testing/testing.h"
#include "BLI_math.h"
diff --git a/source/blender/compositor/COM_precomp.h b/source/blender/compositor/COM_precomp.h
index 4d2681ea0cd..10797f8ce4a 100644
--- a/source/blender/compositor/COM_precomp.h
+++ b/source/blender/compositor/COM_precomp.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
/* Pre-compiled headers, see: D13797. */
#include <cfloat>
diff --git a/source/blender/compositor/intern/COM_MultiThreadedOperation.cc b/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
index d118027202a..385353f011e 100644
--- a/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
+++ b/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "COM_MultiThreadedOperation.h"
#include "COM_ExecutionSystem.h"
diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl b/source/blender/compositor/operations/COM_OpenCLKernels.cl
index d01e209d3e4..cb631517015 100644
--- a/source/blender/compositor/operations/COM_OpenCLKernels.cl
+++ b/source/blender/compositor/operations/COM_OpenCLKernels.cl
@@ -1,24 +1,5 @@
-/*
- * Copyright 2011, 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.
- *
- * Contributor:
- * Jeroen Bakker
- * Monique Dewanchand
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2011 Blender Foundation. */
/// This file contains all opencl kernels for node-operation implementations
diff --git a/source/blender/draw/engines/image/shaders/infos/engine_image_info.hh b/source/blender/draw/engines/image/shaders/infos/engine_image_info.hh
index 8b671686a5c..5804ca6c5a0 100644
--- a/source/blender/draw/engines/image/shaders/infos/engine_image_info.hh
+++ b/source/blender/draw/engines/image/shaders/infos/engine_image_info.hh
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "gpu_shader_create_info.hh"
GPU_SHADER_INTERFACE_INFO(image_engine_color_iface, "").smooth(Type::VEC2, "uv_screen");
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh
index e93f241ad3c..2cd4a874b58 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "gpu_shader_create_info.hh"
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh
index 3e0124546b0..d63d1521728 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "gpu_shader_create_info.hh"
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_cavity_info.hh b/source/blender/draw
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list