blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

License Headers: Use "SPDX-FileCopyrightText: ... Blender Authors, add AUTHORS #110783

Closed
Campbell Barton wants to merge 14 commits from ideasman42/blender:pr-copyright-authors into main
pull from: ideasman42/blender:pr-copyright-authors
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 14 Files Changed 3 +1831
Campbell Barton commented 2023-08-04 07:56:01 +02:00
Owner
Copy Link

Listing the "Blender Foundation" as copyright holder implied the Blender Foundation holds copyright to files which may include work from many developers.

While keeping copyright on headers makes sense for isolated libraries, Blender's own code may be refactored or moved between files in a way that makes the per file copyright holders less meaningful.

Copyright references to the "Blender Foundation" have been replaced with "Blender Authors", with the exception of ./extern/ since these this contains libraries which are more isolated, any changed to license headers there can be handled on a case-by-case basis.

Some directories in ./intern/ have also been excluded:

  • ./intern/cycles/ it's own AUTHORS file is planned.
  • ./intern/opensubdiv/.

An "AUTHORS" file has been added, using the chromium projects authors file as a template.

The authors can be generated & updated using ./tools/utils/authors_git_gen.py which lists authors.

Design task: #110784

Details

  • The file SPDX_blender_foundation_rename_to_authors_once.py renames "Blender Foundation" to "Blender Authors" and is not intended to be committed to main.
  • Changes to tools/utils/credits_git_gen.py are NOT intended to kept, these are temporary changes used to generate the AUTHORS list.
  • The AUTHORS_with_metadata_delete_me.txt list contains meta-data for each author, authors with fewer than 5 lines edited have been omitted from AUTHORS.
  • Authors have been manually de-duplicated.
  • After this is applied, the only references to the Blender[^\n]+Foundation are:
Many files in:
- intern/cycles/
- intern/opensubdiv/

0 ./extern/cuew/include/cuew.h:2:23:  * Copyright 2011-2014 Blender Foundation
1 ./extern/cuew/src/cuew.c:2:23:  * Copyright 2011-2014 Blender Foundation
2 ./extern/curve_fit_nd/intern/curve_fit_corners_detect.c:2:23:  * Copyright (c) 2016, Blender Foundation.
3 ./extern/curve_fit_nd/intern/curve_fit_inline.h:2:23:  * Copyright (c) 2016, Blender Foundation.
4 ./extern/curve_fit_nd/intern/generic_alloc_impl.h:2:23:  * Copyright (c) 2016, Blender Foundation.
5 ./extern/curve_fit_nd/intern/generic_heap.c:2:23:  * Copyright (c) 2016, Blender Foundation.
6 ./extern/curve_fit_nd/intern/generic_heap.h:2:23:  * Copyright (c) 2016, Blender Foundation.
7 ./extern/hipew/include/hipew.h:2:23:  * Copyright 2011-2021 Blender Foundation
8 ./extern/hipew/include/hiprtew.h:2:23:  * Copyright 2011-2021 Blender Foundation
9 ./extern/hipew/src/hipew.c:2:23:  * Copyright 2011-2023 Blender Foundation
10 ./extern/hipew/src/hiprtew.cc:2:23:  * Copyright 2011-2023 Blender Foundation
11 ./extern/hipew/src/util.h:2:23:  * Copyright 2011-2023 Blender Foundation
12 ./extern/nanosvg/blender_nanosvg.c:1:32: /* SPDX-FileCopyrightText: 2023 Blender Foundation
13 ./extern/nanosvg/blender_raster.c:1:32: /* SPDX-FileCopyrightText: 2023 Blender Foundation
14 ./extern/rangetree/intern/generic_alloc_impl.h:2:23:  * Copyright (c) 2016, Blender Foundation.
15 ./extern/sdlew/include/sdlew.h:2:18:  * Copyright 2014 Blender Foundation
16 ./extern/sdlew/src/sdlew.c:2:18:  * Copyright 2014 Blender Foundation
17 ./extern/vulkan_memory_allocator/vk_mem_alloc_impl.cc:1:32: /* SPDX-FileCopyrightText: 2022 Blender Foundation
18 ./extern/wcwidth/wcwidth.h:16:43:  * The Original Code is Copyright (C) 2013 Blender Foundation
19 ./intern/atomic/atomic_ops.h:42:36:  * Modifications Copyright (C) 2016 Blender Foundation
20 ./intern/atomic/intern/atomic_ops_ext.h:42:36:  * Modifications Copyright (C) 2016 Blender Foundation
21 ./intern/atomic/intern/atomic_ops_unix.h:42:36:  * Modifications Copyright (C) 2016 Blender Foundation
22 ./intern/atomic/intern/atomic_ops_utils.h:42:36:  * Modifications Copyright (C) 2016 Blender Foundation
23 ./intern/opensubdiv/internal/evaluator/patch_map.cc:6:52:  * Original code by Pixar with modifications by the Blender foundation. */
24 ./intern/opensubdiv/internal/evaluator/patch_map.h:6:52:  * Original code by Pixar with modifications by the Blender foundation. */

This is part of a proposal #110784 to move to using an AUTHORS file:

Listing the "Blender Foundation" as copyright holder implied the Blender Foundation holds copyright to files which may include work from many developers. While keeping copyright on headers makes sense for isolated libraries, Blender's own code may be refactored or moved between files in a way that makes the per file copyright holders less meaningful. Copyright references to the "Blender Foundation" have been replaced with "Blender Authors", with the exception of `./extern/` since these this contains libraries which are more isolated, any changed to license headers there can be handled on a case-by-case basis. Some directories in `./intern/` have also been excluded: - `./intern/cycles/` it's own `AUTHORS` file is planned. - `./intern/opensubdiv/`. An "AUTHORS" file has been added, using the chromium projects authors file as a template. The authors can be generated & updated using `./tools/utils/authors_git_gen.py` which lists authors. Design task: #110784 ---- ### Details - The file `SPDX_blender_foundation_rename_to_authors_once.py` renames "Blender Foundation" to "Blender Authors" and is not intended to be committed to `main`. - Changes to `tools/utils/credits_git_gen.py` are NOT intended to kept, these are temporary changes used to generate the `AUTHORS` list. - The `AUTHORS_with_metadata_delete_me.txt` list contains meta-data for each author, authors with fewer than 5 lines edited have been omitted from `AUTHORS`. - Authors have been manually de-duplicated. - After this is applied, the only references to the `Blender[^\n]+Foundation` are: ``` Many files in: - intern/cycles/ - intern/opensubdiv/ 0 ./extern/cuew/include/cuew.h:2:23: * Copyright 2011-2014 Blender Foundation 1 ./extern/cuew/src/cuew.c:2:23: * Copyright 2011-2014 Blender Foundation 2 ./extern/curve_fit_nd/intern/curve_fit_corners_detect.c:2:23: * Copyright (c) 2016, Blender Foundation. 3 ./extern/curve_fit_nd/intern/curve_fit_inline.h:2:23: * Copyright (c) 2016, Blender Foundation. 4 ./extern/curve_fit_nd/intern/generic_alloc_impl.h:2:23: * Copyright (c) 2016, Blender Foundation. 5 ./extern/curve_fit_nd/intern/generic_heap.c:2:23: * Copyright (c) 2016, Blender Foundation. 6 ./extern/curve_fit_nd/intern/generic_heap.h:2:23: * Copyright (c) 2016, Blender Foundation. 7 ./extern/hipew/include/hipew.h:2:23: * Copyright 2011-2021 Blender Foundation 8 ./extern/hipew/include/hiprtew.h:2:23: * Copyright 2011-2021 Blender Foundation 9 ./extern/hipew/src/hipew.c:2:23: * Copyright 2011-2023 Blender Foundation 10 ./extern/hipew/src/hiprtew.cc:2:23: * Copyright 2011-2023 Blender Foundation 11 ./extern/hipew/src/util.h:2:23: * Copyright 2011-2023 Blender Foundation 12 ./extern/nanosvg/blender_nanosvg.c:1:32: /* SPDX-FileCopyrightText: 2023 Blender Foundation 13 ./extern/nanosvg/blender_raster.c:1:32: /* SPDX-FileCopyrightText: 2023 Blender Foundation 14 ./extern/rangetree/intern/generic_alloc_impl.h:2:23: * Copyright (c) 2016, Blender Foundation. 15 ./extern/sdlew/include/sdlew.h:2:18: * Copyright 2014 Blender Foundation 16 ./extern/sdlew/src/sdlew.c:2:18: * Copyright 2014 Blender Foundation 17 ./extern/vulkan_memory_allocator/vk_mem_alloc_impl.cc:1:32: /* SPDX-FileCopyrightText: 2022 Blender Foundation 18 ./extern/wcwidth/wcwidth.h:16:43: * The Original Code is Copyright (C) 2013 Blender Foundation 19 ./intern/atomic/atomic_ops.h:42:36: * Modifications Copyright (C) 2016 Blender Foundation 20 ./intern/atomic/intern/atomic_ops_ext.h:42:36: * Modifications Copyright (C) 2016 Blender Foundation 21 ./intern/atomic/intern/atomic_ops_unix.h:42:36: * Modifications Copyright (C) 2016 Blender Foundation 22 ./intern/atomic/intern/atomic_ops_utils.h:42:36: * Modifications Copyright (C) 2016 Blender Foundation 23 ./intern/opensubdiv/internal/evaluator/patch_map.cc:6:52: * Original code by Pixar with modifications by the Blender foundation. */ 24 ./intern/opensubdiv/internal/evaluator/patch_map.h:6:52: * Original code by Pixar with modifications by the Blender foundation. */ ``` This is part of a proposal #110784 to move to using an AUTHORS file:
❤️ 2
Campbell Barton force-pushed pr-copyright-authors from 8f2125227c to f5a6dbd834 2023-08-04 08:01:41 +02:00 Compare
Campbell Barton force-pushed pr-copyright-authors from f5a6dbd834 to c22ec56c24 2023-08-07 09:16:58 +02:00 Compare
Campbell Barton changed title from WIP: Use AUTHORS file, Use "SPDX-FileCopyrightText: YYYY Blender Authors" to License Headers: Use "SPDX-FileCopyrightText: ... Blender Authors, add AUTHORS 2023-08-12 02:47:31 +02:00
Campbell Barton force-pushed pr-copyright-authors from c22ec56c24 to ed4a9ae5ef 2023-08-12 02:48:24 +02:00 Compare
Campbell Barton requested review from Dalai Felinto 2023-08-12 02:48:52 +02:00
Campbell Barton requested review from Bastien Montagne 2023-08-12 02:49:12 +02:00
Campbell Barton requested review from Sergey Sharybin 2023-08-12 02:49:24 +02:00
Campbell Barton requested review from Brecht Van Lommel 2023-08-12 02:49:35 +02:00
Campbell Barton force-pushed pr-copyright-authors from 993ad96c4e to 4d95bd3bfe 2023-08-12 03:37:17 +02:00 Compare
Bastien Montagne approved these changes 2023-08-13 12:01:59 +02:00
Bastien Montagne left a comment
Owner
Copy Link

LGTM in principle, will trust you for the implementation.

LGTM in principle, will trust you for the implementation.
Sergey Sharybin approved these changes 2023-08-14 12:56:17 +02:00
Brecht Van Lommel requested changes 2023-08-14 18:48:57 +02:00
SPDX_blender_foundation_rename_to_authors_once.py Outdated
@ -0,0 +9,4 @@
import os
import re
SOURCE_DIRS = (
Brecht Van Lommel commented 2023-08-14 12:56:47 +02:00
Owner
Copy Link

It seems more future proof and would be a short list to exclude some directories? I can imagine someone forgetting to update this.

It seems more future proof and would be a short list to exclude some directories? I can imagine someone forgetting to update this.
Campbell Barton commented 2023-08-15 01:31:41 +02:00
Author
Owner
Copy Link

This is meant as a one-off-conversion, noted in the PR description under Details that there are some files which won't be included in the PR.

This is meant as a one-off-conversion, noted in the PR description under **Details** that there are some files which won't be included in the PR.
👍 1
brecht marked this conversation as resolved
Campbell Barton requested review from Brecht Van Lommel 2023-08-15 01:31:57 +02:00
Brecht Van Lommel requested changes 2023-08-15 13:28:43 +02:00
Brecht Van Lommel left a comment
Owner
Copy Link

As discussed elsewhere, let's leave Apple developers and the organization out of this file, as this is about copyright and they chose to use Blender Foundation copyright.

Jason Fielder
Michael B Johnson
Michael Jones

As discussed elsewhere, let's leave Apple developers and the organization out of this file, as this is about copyright and they chose to use Blender Foundation copyright. Jason Fielder Michael B Johnson Michael Jones
Campbell Barton force-pushed pr-copyright-authors from 76c6035285 to e525cc0683 2023-08-15 14:51:37 +02:00 Compare
Campbell Barton added 1 commit 2023-08-15 14:55:04 +02:00
Campbell Barton force-pushed pr-copyright-authors from f56b072afc to 7d142aa63f 2023-08-15 15:09:54 +02:00 Compare
Campbell Barton requested review from Brecht Van Lommel 2023-08-15 15:10:26 +02:00
Campbell Barton force-pushed pr-copyright-authors from 7d142aa63f to 5809cf59e2 2023-08-15 15:14:59 +02:00 Compare
Campbell Barton commented 2023-08-15 15:15:32 +02:00
Author
Owner
Copy Link

As discussed elsewhere, let's leave Apple developers and the organization out of this file, as this is about copyright and they chose to use Blender Foundation copyright.

Done, removed all developers with apple email addresses.

> As discussed elsewhere, let's leave Apple developers and the organization out of this file, as this is about copyright and they chose to use Blender Foundation copyright. Done, removed all developers with apple email addresses.
Campbell Barton force-pushed pr-copyright-authors from 5809cf59e2 to 9017babe99 2023-08-15 15:20:05 +02:00 Compare
Brecht Van Lommel approved these changes 2023-08-15 15:25:19 +02:00
Campbell Barton added 1 commit 2023-08-15 15:28:59 +02:00
95a1718592 Escape some characters that warn in gitea's online display 
Escape characters that don't display in gitea (or some terminals)
Dalai Felinto refused to review 2023-08-15 15:43:40 +02:00
Dalai Felinto commented 2023-08-15 15:44:26 +02:00
Owner
Copy Link

I removed myself from reviewer. I support (and trust) the decision you guys came up with.

I removed myself from reviewer. I support (and trust) the decision you guys came up with.
Campbell Barton closed this pull request 2023-08-15 16:22:06 +02:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Bastien Montagne
Sergey Sharybin
Brecht Van Lommel
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset Browser

  
Interest
Asset Browser Project Overview

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Collada

  
Interest
Compatibility
This issue affects/is about backward or forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
Interest
EEVEE & Viewport

  
Interest
Freestyle

  
Interest
Geometry Nodes

  
Interest
Grease Pencil

  
Interest
ID Management

  
Interest
Images & Movies

  
Interest
Import Export

  
Interest
Line Art

  
Interest
Masking

  
Interest
Metal

  
Interest
Modeling

  
Interest
Modifiers

  
Interest
Motion Tracking

  
Interest
Nodes & Physics

  
Interest
OpenGL

  
Interest
Overlay

  
Interest
Overrides

  
Interest
Performance

  
Interest
Physics

  
Interest
Pipeline, Assets & IO

  
Interest
Platforms, Builds & Tests

  
Interest
Python API

  
Interest
Render & Cycles

  
Interest
Render Pipeline

  
Interest
Sculpt, Paint & Texture

  
Interest
Text Editor

  
Interest
Translations

  
Interest
Triaging

  
Interest
Undo

  
Interest
USD

  
Interest
User Interface

  
Interest
UV Editing

  
Interest
VFX & Video

  
Interest
Video Sequencer

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Issues relating to Wayland windowing support.

  
Interest
Workbench

  
Interest: X11

Issues relating to Xorg/X11 support.

  
Legacy
Blender 2.8 Project

  
Legacy
Milestone 1: Basic, Local Asset Browser

  
Legacy
OpenGL Error

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Issues relating to security: https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
Module
EEVEE & Viewport

  
Module
Grease Pencil

  
Module
Modeling

  
Module
Nodes & Physics

  
Module
Pipeline, Assets & IO

  
Module
Platforms, Builds & Tests

  
Module
Python API

  
Module
Render & Cycles

  
Module
Sculpt, Paint & Texture

  
Module
Triaging

  
Module
User Interface

  
Module
VFX & Video

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Priority
High

  
Priority
Low

  
Priority
Normal

  
Priority
Unbreak Now!

  
Status
Archived

  
Status
Confirmed

  
Status
Duplicate

  
Status
Needs Info from Developers

  
Status
Needs Information from User

  
Status
Needs Triage

  
Status
Resolved

  
Type
Bug

  
Type
Design

  
Type
Known Issue

  
Type
Patch

  
Type
Report

  
Type
To Do

No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
5 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#110783
No description provided.
Delete Branch "ideasman42/blender:pr-copyright-authors"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?