From f7876b71cdaa7f9627d1ce9de2e876efaaca19af Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 11 Feb 2022 16:34:06 +1100 Subject: File headers: use SPDX license identifiers Some files needed to be changed manually. --- add_mesh_discombobulator/mesh_discombobulator.py | 4 +++- add_mesh_extra_objects/add_mesh_teapot.py | 4 +++- amaranth/render/meshlight_add.py | 2 ++ btrace/bTrace_panel.py | 2 ++ curve_assign_shapekey.py | 10 ++++------ curve_tools/curves.py | 2 ++ curve_tools/operators.py | 2 ++ greasepencil_tools/import_brush_pack.py | 2 ++ greasepencil_tools/rotate_canvas.py | 16 +++++++++------- io_export_paper_model.py | 6 +++--- lighting_tri_lights.py | 4 +++- magic_uv/lib/bglx.py | 2 ++ materials_utils/enum_values.py | 2 ++ materials_utils/functions.py | 2 ++ materials_utils/menus.py | 1 + materials_utils/operators.py | 2 ++ materials_utils/preferences.py | 2 ++ mesh_auto_mirror.py | 3 ++- object_carver/carver_draw.py | 2 ++ object_carver/carver_operator.py | 2 ++ object_carver/carver_preferences.py | 2 ++ object_carver/carver_profils.py | 2 ++ object_carver/carver_utils.py | 1 + pose_library/asset_browser.py | 2 ++ space_view3d_stored_views/io.py | 4 +++- space_view3d_stored_views/properties.py | 4 +++- viewport_vr_preview/configs/default.py | 2 ++ 27 files changed, 67 insertions(+), 22 deletions(-) diff --git a/add_mesh_discombobulator/mesh_discombobulator.py b/add_mesh_discombobulator/mesh_discombobulator.py index 93f3b3c4..09c6eae0 100644 --- a/add_mesh_discombobulator/mesh_discombobulator.py +++ b/add_mesh_discombobulator/mesh_discombobulator.py @@ -1,4 +1,6 @@ -# GPL # Original Authors: Evan J. Rosky (syrux), Chichiri, Jace Priester # +# SPDX-License-Identifier: GPL-2.0-or-later + +# Original Authors: Evan J. Rosky (syrux), Chichiri, Jace Priester import bpy import random diff --git a/add_mesh_extra_objects/add_mesh_teapot.py b/add_mesh_extra_objects/add_mesh_teapot.py index e4ddbecb..6fc693c4 100644 --- a/add_mesh_extra_objects/add_mesh_teapot.py +++ b/add_mesh_extra_objects/add_mesh_teapot.py @@ -1,4 +1,6 @@ -# GPL # Author, Anthony D'Agostino +# SPDX-License-Identifier: GPL-2.0-or-later + +# Author, Anthony D'Agostino import bpy from bpy.props import ( diff --git a/amaranth/render/meshlight_add.py b/amaranth/render/meshlight_add.py index 0b78b52b..a7febbfa 100644 --- a/amaranth/render/meshlight_add.py +++ b/amaranth/render/meshlight_add.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import bpy from mathutils import Vector from amaranth.utils import cycles_exists diff --git a/btrace/bTrace_panel.py b/btrace/bTrace_panel.py index 2d267e8a..6783207a 100644 --- a/btrace/bTrace_panel.py +++ b/btrace/bTrace_panel.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import bpy from bpy.types import Panel diff --git a/curve_assign_shapekey.py b/curve_assign_shapekey.py index 643eb3a2..a87e89b0 100644 --- a/curve_assign_shapekey.py +++ b/curve_assign_shapekey.py @@ -1,14 +1,12 @@ -# -# +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright (C) 2019 Shrinivas Kulkarni + # This Blender add-on assigns one or more Bezier Curves as shape keys to another # Bezier Curve # # Supported Blender Versions: 2.8x # -# Copyright (C) 2019 Shrinivas Kulkarni -# -# License: GPL-3.0 (https://github.com/Shriinivas/assignshapekey/blob/master/LICENSE) -# +# https://github.com/Shriinivas/assignshapekey/blob/master/LICENSE import bpy, bmesh, bgl, gpu from gpu_extras.batch import batch_for_shader diff --git a/curve_tools/curves.py b/curve_tools/curves.py index 8a1a1484..8b5e2e7f 100644 --- a/curve_tools/curves.py +++ b/curve_tools/curves.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + from . import mathematics import bpy diff --git a/curve_tools/operators.py b/curve_tools/operators.py index 2b1fe12d..e4480f88 100644 --- a/curve_tools/operators.py +++ b/curve_tools/operators.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import time import threading diff --git a/greasepencil_tools/import_brush_pack.py b/greasepencil_tools/import_brush_pack.py index b1306bed..2b960af6 100644 --- a/greasepencil_tools/import_brush_pack.py +++ b/greasepencil_tools/import_brush_pack.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import bpy import re import ssl diff --git a/greasepencil_tools/rotate_canvas.py b/greasepencil_tools/rotate_canvas.py index f89e006e..6db43234 100644 --- a/greasepencil_tools/rotate_canvas.py +++ b/greasepencil_tools/rotate_canvas.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + from .prefs import get_addon_prefs import bpy @@ -100,7 +102,7 @@ class RC_OT_RotateCanvas(bpy.types.Operator): ## area deformation restore new_cam_offset = mathutils.Vector((new_cam_offset[0], new_cam_offset[1] * self.ratio_inv)) - + context.space_data.region_3d.view_camera_offset = new_cam_offset def execute(self, context): @@ -201,7 +203,7 @@ class RC_OT_RotateCanvas(bpy.types.Operator): # CORRECT UI OVERLAP FROM HEADER TOOLBAR regs = context.area.regions if context.preferences.system.use_region_overlap: - w = context.area.width + w = context.area.width # minus tool header h = context.area.height - regs[0].height else: @@ -209,9 +211,9 @@ class RC_OT_RotateCanvas(bpy.types.Operator): w = context.area.width - regs[2].width - regs[3].width # minus tool header + header h = context.area.height - regs[0].height - regs[1].height - + self.ratio = h / w - self.ratio_inv = w / h + self.ratio_inv = w / h if self.in_cam: # Get camera from scene @@ -221,8 +223,8 @@ class RC_OT_RotateCanvas(bpy.types.Operator): if self.cam.lock_rotation[:] != (False, False, False): self.report({'WARNING'}, 'Camera rotation is locked') return {'CANCELLED'} - - if self.use_view_center: + + if self.use_view_center: self.center = mathutils.Vector((w/2, h/2)) else: self.center = self.get_center_view(context, self.cam) @@ -234,7 +236,7 @@ class RC_OT_RotateCanvas(bpy.types.Operator): # store camera matrix world self.cam_matrix = self.cam.matrix_world.copy() # self.cam_init_euler = self.cam.rotation_euler.copy() - + ## initialize current view_offset in camera self.view_cam_offset = mathutils.Vector(context.space_data.region_3d.view_camera_offset) diff --git a/io_export_paper_model.py b/io_export_paper_model.py index 94d16361..288c4520 100644 --- a/io_export_paper_model.py +++ b/io_export_paper_model.py @@ -1,6 +1,6 @@ -# -*- coding: utf-8 -*- -# This script is Free software. Please share and reuse. -# ♡2010-2021 Adam Dominec +# SPDX-License-Identifier: GPL-2.0-or-later + +# Copyright 2010-2021 Adam Dominec ## Code structure # This file consists of several components, in this order: diff --git a/lighting_tri_lights.py b/lighting_tri_lights.py index f86972ed..5b31ad27 100644 --- a/lighting_tri_lights.py +++ b/lighting_tri_lights.py @@ -1,4 +1,6 @@ -# gpl: author Daniel Schalla, maintained by meta-androcto +# SPDX-License-Identifier: GPL-2.0-or-later + +# author Daniel Schalla, maintained by meta-androcto bl_info = { "name": "Tri-lighting", diff --git a/magic_uv/lib/bglx.py b/magic_uv/lib/bglx.py index e72cd734..c1f696ab 100644 --- a/magic_uv/lib/bglx.py +++ b/magic_uv/lib/bglx.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + from threading import Lock import bgl diff --git a/materials_utils/enum_values.py b/materials_utils/enum_values.py index 2f257400..9e198806 100644 --- a/materials_utils/enum_values.py +++ b/materials_utils/enum_values.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import bpy diff --git a/materials_utils/functions.py b/materials_utils/functions.py index 4663fbeb..9397257a 100644 --- a/materials_utils/functions.py +++ b/materials_utils/functions.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import bpy from math import radians, degrees diff --git a/materials_utils/menus.py b/materials_utils/menus.py index 2e444298..3fff4a0d 100644 --- a/materials_utils/menus.py +++ b/materials_utils/menus.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later import bpy from .functions import * diff --git a/materials_utils/operators.py b/materials_utils/operators.py index a91c2301..98eab763 100644 --- a/materials_utils/operators.py +++ b/materials_utils/operators.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import bpy from bpy.types import Operator diff --git a/materials_utils/preferences.py b/materials_utils/preferences.py index 7fdbd9ff..fdbb4993 100644 --- a/materials_utils/preferences.py +++ b/materials_utils/preferences.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import bpy from bpy.types import ( diff --git a/mesh_auto_mirror.py b/mesh_auto_mirror.py index 7057227b..114ee9d3 100644 --- a/mesh_auto_mirror.py +++ b/mesh_auto_mirror.py @@ -1,8 +1,9 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + ###################################################################################################### # A simple add-on to auto cut in two and mirror an object # # Actually partially uncommented (see further version) # # Author: Lapineige, Bookyakuno # -# License: GPL v3 # ###################################################################################################### # 2.8 update by Bookyakuno, meta-androcto diff --git a/object_carver/carver_draw.py b/object_carver/carver_draw.py index f2a3aadc..c7000787 100644 --- a/object_carver/carver_draw.py +++ b/object_carver/carver_draw.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import bpy import bgl import blf diff --git a/object_carver/carver_operator.py b/object_carver/carver_operator.py index 880f6491..4c64fdf0 100644 --- a/object_carver/carver_operator.py +++ b/object_carver/carver_operator.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import bpy import bpy_extras import sys diff --git a/object_carver/carver_preferences.py b/object_carver/carver_preferences.py index 1e6bc7ab..873a814d 100644 --- a/object_carver/carver_preferences.py +++ b/object_carver/carver_preferences.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + import bpy from bpy.props import ( BoolProperty, diff --git a/object_carver/carver_profils.py b/object_carver/carver_profils.py index 9c99bf97..d786c280 100644 --- a/object_carver/carver_profils.py +++ b/object_carver/carver_profils.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + from mathutils import ( Vector, ) diff --git a/object_carver/carver_utils.py b/object_carver/carver_utils.py index b026c1d1..0ac4c991 100644 --- a/object_carver/carver_utils.py +++ b/object_carver/carver_utils.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later import bpy import bgl diff --git a/pose_library/asset_browser.py b/pose_library/asset_browser.py index a95e48fe..d4662284 100644 --- a/pose_library/asset_browser.py +++ b/pose_library/asset_browser.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + """Functions for finding and working with Asset Browsers.""" from typing import Iterable, Optional, Tuple diff --git a/space_view3d_stored_views/io.py b/space_view3d_stored_views/io.py index 83a5499d..c17d307e 100644 --- a/space_view3d_stored_views/io.py +++ b/space_view3d_stored_views/io.py @@ -1,4 +1,6 @@ -# gpl authors: nfloyd, Francesco Siddi +# SPDX-License-Identifier: GPL-2.0-or-later + +# Authors: nfloyd, Francesco Siddi import gzip import os diff --git a/space_view3d_stored_views/properties.py b/space_view3d_stored_views/properties.py index 51666ce2..a9fd6b2b 100644 --- a/space_view3d_stored_views/properties.py +++ b/space_view3d_stored_views/properties.py @@ -1,4 +1,6 @@ -# gpl authors: nfloyd, Francesco Siddi +# SPDX-License-Identifier: GPL-2.0-or-later + +# authors: nfloyd, Francesco Siddi import bpy from bpy.types import PropertyGroup from bpy.props import ( diff --git a/viewport_vr_preview/configs/default.py b/viewport_vr_preview/configs/default.py index a20c5c6d..a42b3f45 100644 --- a/viewport_vr_preview/configs/default.py +++ b/viewport_vr_preview/configs/default.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + actionconfig_version = (3, 0, 39) actionconfig_data = \ [("blender_default", -- cgit v1.2.3