Cleanup: use consistent copyright location, move descriptions

Order copyright immediately after the license block,
this was done almost everywhere with a few exceptions.

Remove authors from a few files (we had already removed "Contributors"
section however with old patches being applied this gets added back in).

Also move descriptive text into the doxygen comment block under \file.
In some cases remove the text as it was accidentally copied.

intern/quadriflow/quadriflow_capi.cpp

@@ -1,20 +1,20 @@
-// Copyright 2019 Blender Foundation. All rights reserved.
+/*
-//
+ * This program is free software; you can redistribute it and/or
-// This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
-// modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
-// as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
-// of the License, or (at your option) any later version.
+ *
-//
+ * This program is distributed in the hope that it will be useful,
-// This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
-// GNU General Public License for more details.
+ *
-//
+ * You should have received a copy of the GNU General Public License
-// You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
-// along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
-//
+ * Copyright 2019 Blender Foundation. All rights reserved.
-// Author: Sebastian Parborg, Pablo Dobarro
+ */
 
 #include <unordered_map>
 

intern/quadriflow/quadriflow_capi.hpp

@@ -1,20 +1,20 @@
-// Copyright 2019 Blender Foundation. All rights reserved.
+/*
-//
+ * This program is free software; you can redistribute it and/or
-// This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
-// modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
-// as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
-// of the License, or (at your option) any later version.
+ *
-//
+ * This program is distributed in the hope that it will be useful,
-// This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
-// GNU General Public License for more details.
+ *
-//
+ * You should have received a copy of the GNU General Public License
-// You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
-// along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
-//
+ * Copyright 2019 Blender Foundation. All rights reserved.
-// Author: Sebastian Parborg, Pablo Dobarro
+ */
 
 #ifndef QUADRIFLOW_CAPI_HPP
 #define QUADRIFLOW_CAPI_HPP

intern/sky/source/sky_model.cpp

@@ -1,32 +1,30 @@
 /*
-This source is published under the following 3-clause BSD license.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-Copyright (c) 2012 - 2013, Lukas Hosek and Alexander Wilkie
+ *
-All rights reserved.
+ *     * Redistributions of source code must retain the above copyright
-
+ *       notice, this list of conditions and the following disclaimer.
-Redistribution and use in source and binary forms, with or without
+ *     * Redistributions in binary form must reproduce the above copyright
-modification, are permitted provided that the following conditions are met:
+ *       notice, this list of conditions and the following disclaimer in the
-
+ *       documentation and/or other materials provided with the distribution.
-    * Redistributions of source code must retain the above copyright
+ *     * None of the names of the contributors may be used to endorse or promote
-      notice, this list of conditions and the following disclaimer.
+ *       products derived from this software without specific prior written
-    * Redistributions in binary form must reproduce the above copyright
+ *       permission.
-      notice, this list of conditions and the following disclaimer in the
+ *
-      documentation and/or other materials provided with the distribution.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    * None of the names of the contributors may be used to endorse or promote
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-      products derived from this software without specific prior written
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-      permission.
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * Copyright (c) 2012 - 2013, Lukas Hosek and Alexander Wilkie
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * All rights reserved.
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ */
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
 
 /* ============================================================================
 

intern/sky/source/sky_model_data.h

@@ -1,32 +1,30 @@
 /*
-This source is published under the following 3-clause BSD license.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-Copyright (c) 2012 - 2013, Lukas Hosek and Alexander Wilkie
+ *
-All rights reserved.
+ *     * Redistributions of source code must retain the above copyright
-
+ *       notice, this list of conditions and the following disclaimer.
-Redistribution and use in source and binary forms, with or without
+ *     * Redistributions in binary form must reproduce the above copyright
-modification, are permitted provided that the following conditions are met:
+ *       notice, this list of conditions and the following disclaimer in the
-
+ *       documentation and/or other materials provided with the distribution.
-    * Redistributions of source code must retain the above copyright
+ *     * None of the names of the contributors may be used to endorse or promote
-      notice, this list of conditions and the following disclaimer.
+ *       products derived from this software without specific prior written
-    * Redistributions in binary form must reproduce the above copyright
+ *       permission.
-      notice, this list of conditions and the following disclaimer in the
+ *
-      documentation and/or other materials provided with the distribution.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    * None of the names of the contributors may be used to endorse or promote
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-      products derived from this software without specific prior written
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-      permission.
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * Copyright (c) 2012 - 2013, Lukas Hosek and Alexander Wilkie
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * All rights reserved.
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ */
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
 
 /* ============================================================================
 

intern/sky/source/sky_nishita.cpp

@@ -1,6 +1,4 @@
 /*
- * Copyright 2011-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
@@ -12,6 +10,8 @@
  * 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 2011-2020 Blender Foundation
  */
 
 /** \file

release/scripts/modules/console/__init__.py

@@ -1,5 +1,3 @@
-# Copyright (c) 2009 www.stani.be (GPL license)
-
 # ##### BEGIN GPL LICENSE BLOCK #####
 #
 #  This program is free software; you can redistribute it and/or
@@ -18,6 +16,8 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+# Copyright (c) 2009 www.stani.be
+
 # <pep8 compliant>
 
 """Package for console specific modules."""

release/scripts/modules/console/complete_calltip.py

@@ -1,5 +1,3 @@
-# Copyright (c) 2009 www.stani.be (GPL license)
-
 # ##### BEGIN GPL LICENSE BLOCK #####
 #
 #  This program is free software; you can redistribute it and/or
@@ -18,6 +16,8 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+# Copyright (c) 2009 www.stani.be
+
 # <pep8-80 compliant>
 
 import inspect

release/scripts/modules/console/complete_import.py

@@ -1,5 +1,3 @@
-# Copyright (c) 2009 Fernando Perez, www.stani.be (GPL license)
-
 # ##### BEGIN GPL LICENSE BLOCK #####
 #
 #  This program is free software; you can redistribute it and/or
@@ -18,6 +16,8 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+# Copyright (c) 2009 Fernando Perez, www.stani.be
+
 # Original copyright (see docstring):
 # ****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>

release/scripts/modules/console/complete_namespace.py

@@ -1,5 +1,3 @@
-# Copyright (c) 2009 www.stani.be (GPL license)
-
 # ##### BEGIN GPL LICENSE BLOCK #####
 #
 #  This program is free software; you can redistribute it and/or
@@ -18,6 +16,8 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+# Copyright (c) 2009 www.stani.be
+
 # <pep8-80 compliant>
 
 """Autocomplete with the standard library"""

release/scripts/modules/console/intellisense.py

@@ -1,5 +1,3 @@
-# Copyright (c) 2009 www.stani.be (GPL license)
-
 # ##### BEGIN GPL LICENSE BLOCK #####
 #
 #  This program is free software; you can redistribute it and/or
@@ -18,6 +16,8 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+# Copyright (c) 2009 www.stani.be
+
 # <pep8-80 compliant>
 
 """This module provides intellisense features such as:

release/scripts/startup/bl_operators/object_align.py

@@ -1,5 +1,4 @@
 # ##### BEGIN GPL LICENSE BLOCK #####
-
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

release/scripts/startup/bl_ui/properties_output.py

@@ -1,5 +1,4 @@
 # ##### BEGIN GPL LICENSE BLOCK #####
-
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

release/scripts/startup/bl_ui/properties_render.py

@@ -1,5 +1,4 @@
 # ##### BEGIN GPL LICENSE BLOCK #####
-
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

source/blender/blenkernel/intern/armature_pose.cc

@@ -15,8 +15,6 @@
  *
  * The Original Code is Copyright (C) 2015 Blender Foundation.
  * All rights reserved.
- *
- * Defines and code for core node types
  */
 
 /** \file

source/blender/blenkernel/intern/armature_update.c

@@ -15,8 +15,6 @@
  *
  * The Original Code is Copyright (C) 2015 Blender Foundation.
  * All rights reserved.
- *
- * Defines and code for core node types
  */
 
 /** \file

source/blender/blenkernel/intern/attribute.c

@@ -15,13 +15,12 @@
  *
  * The Original Code is Copyright (C) 2006 Blender Foundation.
  * All rights reserved.
- *
- * Implementation of generic geometry attributes management. This is built
- * on top of CustomData, which manages individual domains.
  */
 
 /** \file
  * \ingroup bke
+ * Implementation of generic geometry attributes management. This is built
+ * on top of CustomData, which manages individual domains.
  */
 
 #include <string.h>

source/blender/blenkernel/intern/cdderivedmesh.c

@@ -16,12 +16,11 @@
  * The Original Code is Copyright (C) 2006 Blender Foundation.
  * All rights reserved.
  * Implementation of CDDerivedMesh.
- *
- * BKE_cdderivedmesh.h contains the function prototypes for this file.
  */
 
 /** \file
  * \ingroup bke
+ * BKE_cdderivedmesh.h contains the function prototypes for this file.
  */
 
 #include "atomic_ops.h"

source/blender/blenkernel/intern/customdata.cc

@@ -15,13 +15,13 @@
  *
  * The Original Code is Copyright (C) 2006 Blender Foundation.
  * All rights reserved.
- * Implementation of CustomData.
- *
- * BKE_customdata.h contains the function prototypes for this file.
  */
 
 /** \file
  * \ingroup bke
+ * Implementation of CustomData.
+ *
+ * BKE_customdata.h contains the function prototypes for this file.
  */
 
 #include "MEM_guardedalloc.h"

source/blender/blenkernel/intern/idtype.c

@@ -15,9 +15,6 @@
  *
  * The Original Code is Copyright (C) 2005 by the Blender Foundation.
  * All rights reserved.
- * Modifier stack implementation.
- *
- * BKE_modifier.h contains the function prototypes for this file.
  */
 
 /** \file

source/blender/blenkernel/intern/mball.c

@@ -15,6 +15,11 @@
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
+ */
+
+/** \file
+ * \ingroup bke
+ *
  * MetaBalls are created from a single Object (with a name without number in it),
  * here the DispList and BoundBox also is located.
  * All objects with the same name (but with a number in it) are added to this.
@@ -22,10 +27,6 @@
  * texture coordinates are patched within the displist
  */
 
-/** \file
- * \ingroup bke
- */
-
 #include <ctype.h>
 #include <float.h>
 #include <math.h>

source/blender/blenkernel/intern/modifier.c

@@ -15,13 +15,12 @@
  *
  * The Original Code is Copyright (C) 2005 by the Blender Foundation.
  * All rights reserved.
- * Modifier stack implementation.
- *
- * BKE_modifier.h contains the function prototypes for this file.
  */
 
 /** \file
  * \ingroup bke
+ * Modifier stack implementation.
+ * BKE_modifier.h contains the function prototypes for this file.
  */
 
 /* Allow using deprecated functionality for .blend file I/O. */

source/blender/blenkernel/intern/ocean.c

@@ -15,13 +15,13 @@
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
- *
- * Based on original code by Drew Whitehouse / Houdini Ocean Toolkit
- * OpenMP hints by Christian Schnellhammer
  */
 
 /** \file
  * \ingroup bke
+ *
+ * Based on original code by Drew Whitehouse / Houdini Ocean Toolkit
+ * OpenMP hints by Christian Schnellhammer
  */
 
 #include <math.h>

source/blender/blenkernel/intern/vfontdata_freetype.c

@@ -15,6 +15,10 @@
  *
  * The Original Code is written by Rob Haarsma (phase)
  * All rights reserved.
+ */
+
+/** \file
+ * \ingroup bke
  *
  * This code parses the Freetype font outline data to chains of Blender's bezier-triples.
  * Additional information can be found at the bottom of this file.
@@ -22,10 +26,6 @@
  * Code that uses exotic character maps is present but commented out.
  */
 
-/** \file
- * \ingroup bke
- */
-
 #include <ft2build.h>
 #include FT_FREETYPE_H
 /* not needed yet */

source/blender/compositor/nodes/COM_AntiAliasingNode.cc

@@ -1,6 +1,4 @@
 /*
- * Copyright 2017, 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
@@ -15,7 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: IRIE Shinsuke
+ * Copyright 2017, Blender Foundation.
  */
 
 #include "COM_AntiAliasingNode.h"

source/blender/compositor/nodes/COM_AntiAliasingNode.h

@@ -1,6 +1,4 @@
 /*
- * Copyright 2017, 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
@@ -15,7 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: IRIE Shinsuke
+ * Copyright 2017, Blender Foundation.
  */
 
 #pragma once

source/blender/compositor/operations/COM_SMAAOperation.cc

@@ -1,6 +1,4 @@
 /*
- * Copyright 2017, 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
@@ -15,7 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: IRIE Shinsuke
+ * Copyright 2017, Blender Foundation.
  */
 
 #include "COM_SMAAOperation.h"

source/blender/compositor/operations/COM_SMAAOperation.h

@@ -1,6 +1,4 @@
 /*
- * Copyright 2017, 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
@@ -15,7 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: IRIE Shinsuke
+ * Copyright 2017, Blender Foundation.
  */
 
 #pragma once