File headers: use SPDX for Zlib license

4 files changed, 10 insertions, 58 deletions

diff --git a/doc/license/SPDX-license-identifiers.txt b/doc/license/SPDX-license-identifiers.txt
index 0c7ea7ba4ed..7f43ad3aab0 100644
--- a/doc/license/SPDX-license-identifiers.txt
+++ b/doc/license/SPDX-license-identifiers.txt
@@ -3,3 +3,4 @@ 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
+Zlib                                                https://spdx.org/licenses/Zlib.html
diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c
index b4596dc35ad..fe302eb5e7c 100644
--- a/intern/mikktspace/mikktspace.c
+++ b/intern/mikktspace/mikktspace.c
@@ -1,25 +1,9 @@
+/* SPDX-License-Identifier: Zlib
+ * Copyright 2011 by Morten S. Mikkelsen. */
+
 /** \file
  * \ingroup mikktspace
  */
-/**
- *  Copyright (C) 2011 by Morten S. Mikkelsen
- *
- *  This software is provided 'as-is', without any express or implied
- *  warranty.  In no event will the authors be held liable for any damages
- *  arising from the use of this software.
- *
- *  Permission is granted to anyone to use this software for any purpose,
- *  including commercial applications, and to alter it and redistribute it
- *  freely, subject to the following restrictions:
- *
- *  1. The origin of this software must not be misrepresented; you must not
- *     claim that you wrote the original software. If you use this software
- *     in a product, an acknowledgment in the product documentation would be
- *     appreciated but is not required.
- *  2. Altered source versions must be plainly marked as such, and must not be
- *     misrepresented as being the original software.
- *  3. This notice may not be removed or altered from any source distribution.
- */
 
 #include <assert.h>
 #include <float.h>
diff --git a/intern/mikktspace/mikktspace.h b/intern/mikktspace/mikktspace.h
index cbd541494a7..30c0584c2fb 100644
--- a/intern/mikktspace/mikktspace.h
+++ b/intern/mikktspace/mikktspace.h
@@ -1,25 +1,9 @@
+/* SPDX-License-Identifier: Zlib
+ * Copyright 2011 by Morten S. Mikkelsen. */
+
 /** \file
  * \ingroup mikktspace
  */
-/**
- *  Copyright (C) 2011 by Morten S. Mikkelsen
- *
- *  This software is provided 'as-is', without any express or implied
- *  warranty.  In no event will the authors be held liable for any damages
- *  arising from the use of this software.
- *
- *  Permission is granted to anyone to use this software for any purpose,
- *  including commercial applications, and to alter it and redistribute it
- *  freely, subject to the following restrictions:
- *
- *  1. The origin of this software must not be misrepresented; you must not
- *     claim that you wrote the original software. If you use this software
- *     in a product, an acknowledgment in the product documentation would be
- *     appreciated but is not required.
- *  2. Altered source versions must be plainly marked as such, and must not be
- *     misrepresented as being the original software.
- *  3. This notice may not be removed or altered from any source distribution.
- */
 
 #ifndef __MIKKTSPACE_H__
 #define __MIKKTSPACE_H__
diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c
index 05b280a5a39..4cd377b109e 100644
--- a/source/blender/blenlib/intern/math_rotation.c
+++ b/source/blender/blenlib/intern/math_rotation.c
@@ -1840,30 +1840,13 @@ void sub_eul_euleul(float r_eul[3], float a[3], float b[3], const short order)
 
 /******************************* Dual Quaternions ****************************/
 
-/**
- * Conversion routines between (regular quaternion, translation) and
- * dual quaternion.
+/* Conversion routines between (regular quaternion, translation) and dual quaternion.
  *
  * Version 1.0.0, February 7th, 2007
  *
- * Copyright (C) 2006-2007 University of Dublin, Trinity College, All Rights
- * Reserved
+ * SPDX-License-Identifier: Zlib
+ * Copyright 2006-2007 University of Dublin, Trinity College, All Rights Reserved.
  *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the author(s) be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
  * Changes for Blender:
  * - renaming, style changes and optimization's
  * - added support for scaling