[Bf-blender-cvs] [d70350403fb] blender2.7: Cleanup: manually remove header text not handled by automation
Campbell Barton
noreply at git.blender.org
Fri Feb 1 16:38:30 CET 2019
Commit: d70350403fb8e5a51a4449be0b5efc09cecdd975
Author: Campbell Barton
Date: Sat Feb 2 01:45:34 2019 +1100
Branches: blender2.7
https://developer.blender.org/rBd70350403fb8e5a51a4449be0b5efc09cecdd975
Cleanup: manually remove header text not handled by automation
===================================================================
M extern/wcwidth/wcwidth.h
M intern/opensubdiv/gpu_shader_opensubdiv_fragment.glsl
M intern/opensubdiv/gpu_shader_opensubdiv_geometry.glsl
M intern/opensubdiv/gpu_shader_opensubdiv_vertex.glsl
M source/blender/blenkernel/BKE_colortools.h
M source/blender/blenkernel/intern/colortools.c
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
M source/blender/editors/include/UI_resources.h
M source/blender/editors/interface/resources.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/space_api/spacetypes.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/imbuf/intern/openexr/openexr_stub.cpp
M source/blender/makesdna/DNA_color_types.h
M source/blender/python/intern/bpy.h
M source/blender/render/extern/include/RE_render_ext.h
M source/blender/render/extern/include/RE_shader_ext.h
M source/blender/render/intern/include/zbuf.h
M source/blender/render/intern/source/imagetexture.c
M source/blender/windowmanager/intern/wm_cursors.c
M tests/gtests/testing/testing_main.cc
===================================================================
diff --git a/extern/wcwidth/wcwidth.h b/extern/wcwidth/wcwidth.h
index e327921b6ea..9ae6ec9ef14 100644
--- a/extern/wcwidth/wcwidth.h
+++ b/extern/wcwidth/wcwidth.h
@@ -1,6 +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
* as published by the Free Software Foundation; either version 2
@@ -17,10 +15,6 @@
*
* The Original Code is Copyright (C) 2013 Blender Foundation.
* All rights reserved.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
*/
#ifndef __WCWIDTH_H__
diff --git a/intern/opensubdiv/gpu_shader_opensubdiv_fragment.glsl b/intern/opensubdiv/gpu_shader_opensubdiv_fragment.glsl
index 1e36d549360..76a18df8c32 100644
--- a/intern/opensubdiv/gpu_shader_opensubdiv_fragment.glsl
+++ b/intern/opensubdiv/gpu_shader_opensubdiv_fragment.glsl
@@ -1,6 +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
* as published by the Free Software Foundation; either version 2
@@ -17,10 +15,6 @@
*
* The Original Code is Copyright (C) 2014 Blender Foundation.
* All rights reserved.
- *
- * Contributor(s): Sergey Sharybin
- *
- * ***** END GPL LICENSE BLOCK *****
*/
struct VertexData {
diff --git a/intern/opensubdiv/gpu_shader_opensubdiv_geometry.glsl b/intern/opensubdiv/gpu_shader_opensubdiv_geometry.glsl
index 3a83d44a8be..03fbb534fcb 100644
--- a/intern/opensubdiv/gpu_shader_opensubdiv_geometry.glsl
+++ b/intern/opensubdiv/gpu_shader_opensubdiv_geometry.glsl
@@ -1,6 +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
* as published by the Free Software Foundation; either version 2
@@ -17,10 +15,6 @@
*
* The Original Code is Copyright (C) 2014 Blender Foundation.
* All rights reserved.
- *
- * Contributor(s): Sergey Sharybin
- *
- * ***** END GPL LICENSE BLOCK *****
*/
struct VertexData {
diff --git a/intern/opensubdiv/gpu_shader_opensubdiv_vertex.glsl b/intern/opensubdiv/gpu_shader_opensubdiv_vertex.glsl
index 6d3c06f59c9..c38975252a2 100644
--- a/intern/opensubdiv/gpu_shader_opensubdiv_vertex.glsl
+++ b/intern/opensubdiv/gpu_shader_opensubdiv_vertex.glsl
@@ -1,6 +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
* as published by the Free Software Foundation; either version 2
@@ -17,10 +15,6 @@
*
* The Original Code is Copyright (C) 2014 Blender Foundation.
* All rights reserved.
- *
- * Contributor(s): Sergey Sharybin
- *
- * ***** END GPL LICENSE BLOCK *****
*/
struct VertexData {
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index f72e240a16f..9e1f17f6285 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -15,7 +15,6 @@
*
* The Original Code is Copyright (C) 2006 Blender Foundation.
* All rights reserved.
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
#ifndef __BKE_COLORTOOLS_H__
#define __BKE_COLORTOOLS_H__
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 790d4bc3800..97c923c312b 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -15,7 +15,6 @@
*
* The Original Code is Copyright (C) 2005 Blender Foundation.
* All rights reserved.
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
/** \file blender/blenkernel/intern/colortools.c
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
index 32be17c7fc3..a59fc5e3d85 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
@@ -24,7 +24,6 @@
#include "MEM_guardedalloc.h"
// this part has been copied from the double edge mask
-// Contributor(s): Peter Larabell.
static void do_adjacentKeepBorders(unsigned int t, unsigned int rw, unsigned int *limask, unsigned int *lomask, unsigned int *lres, float *res, unsigned int *rsize)
{
int x;
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index 8f2c99289e2..bbd40e42dab 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -1,6 +1,4 @@
/*
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
* 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
@@ -17,7 +15,6 @@
*
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved.
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
/** \file UI_resources.h
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 1f412109f19..7dd217f8244 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -15,7 +15,6 @@
*
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved.
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
/** \file blender/editors/interface/resources.c
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 5a86f29af2f..b83d40d8a8d 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -2829,26 +2829,6 @@ void MESH_OT_solidify(wmOperatorType *ot)
/** \name Knife Subdivide Operator
* \{ */
-/* ******************************************************************** */
-/* Knife Subdivide Tool. Subdivides edges intersected by a mouse trail
- * drawn by user.
- *
- * Currently mapped to KKey when in MeshEdit mode.
- * Usage:
- * - Hit Shift K, Select Centers or Exact
- * - Hold LMB down to draw path, hit RETKEY.
- * - ESC cancels as expected.
- *
- * Contributed by Robert Wenzlaff (Det. Thorn).
- *
- * 2.5 Revamp:
- * - non modal (no menu before cutting)
- * - exit on mouse release
- * - polygon/segment drawing can become handled by WM cb later
- *
- * bmesh port version
- */
-
#define KNIFE_EXACT 1
#define KNIFE_MIDPOINT 2
#define KNIFE_MULTICUT 3
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 940bcddfea1..dc1b54ae2ed 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -14,8 +14,6 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) Blender Foundation, 2008
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
/** \file blender/editors/space_api/spacetypes.c
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index ea2d8d4cba5..a254111e489 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -1,6 +1,4 @@
/*
- * ***** BEGIN GPLLICENSE BLOCK *****
- *
* 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
diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
index 8ce0e8006ad..ec357fe7161 100644
--- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
@@ -1,6 +1,4 @@
/*
- * ***** BEGIN GPLLICENSE BLOCK *****
- *
* 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
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h
index 7b28ea8442f..408b3d3d4f3 100644
--- a/source/blender/makesdna/DNA_color_types.h
+++ b/source/blender/makesdna/DNA_color_types.h
@@ -15,7 +15,6 @@
*
* The Original Code is Copyright (C) 2006 Blender Foundation.
* All rights reserved.
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
/** \file DNA_color_types.h
diff --git a/source/blender/python/intern/bpy.h b/source/blender/python/intern/bpy.h
index d9be07e91a1..ebbd040c63a 100644
--- a/source/blender/python/intern/bpy.h
+++ b/source/blender/python/intern/bpy.h
@@ -12,7 +12,7 @@
* 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.
- * ***** END GPL LICENSE BLOCK ***** */
+ */
/** \file blender/python/intern/bpy.h
* \ingroup pythonintern
diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h
index ee31d344d94..34ae59280f6 100644
--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/extern/include/RE_render_ext.h
@@ -15,7 +15,6 @@
*
* The Original Code is Copyright (C) 2006 by Blender Foundation
* All rights reserved.
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
/** \file RE_render_ext.h
* \ingroup render
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index ea3ddbf3736..e57feb7e8bc 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -15,7 +15,6 @@
*
* The Original Code is Copyright (C) 2006 by Blender Foundation
* All rights reserved.
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
/** \file RE_shader_ext.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list