Skip to content

Commit 12aaf86

Browse files
CodeFHDhowetuft
authored andcommitted
Remove obsolete bl_info dictionary, merge information into blender_manifest.toml and AUTHORS.txt
1 parent 0f22108 commit 12aaf86

3 files changed

Lines changed: 11 additions & 21 deletions

File tree

__init__.py

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,12 @@
1212
os.environ["SSL_CERT_FILE"] = certifi.where()
1313
os.environ["REQUESTS_CA_BUNDLE"] = certifi.where()
1414

15-
bl_info = {
16-
"name": "LuxCoreRender",
17-
"author": "Simon Wendsche (B.Y.O.B.), Michael Klemm (neo2068), Johannes Hinrichs (CodeHD), Howetuft, Odilkhan Yakubov (odil24), acasta69, u3dreal, Philstix",
18-
"version": (2, 10, 1),
19-
"blender": (4, 2, 0),
20-
"category": "Render",
21-
"description": "LuxCoreRender integration for Blender",
22-
#"warning": "rc.1",
23-
24-
# Import Blender packages
25-
import bpy
26-
import addon_utils
27-
import nodeitems_utils
28-
29-
# Check if Blender and OS versions are compatible
30-
if bpy.app.version < (4, 2, 0):
31-
raise RuntimeError(
32-
"\n\nUnsupported Blender version. "
33-
"4.2 or higher is required by BlendLuxCore."
34-
)
15+
# Load version information from blender_manifest.toml.
16+
# Replaced the old "bl_info" dictionary.
17+
manifest_path = pathlib.Path(__file__).parent.resolve() / 'blender_manifest.toml'
18+
with open(manifest_path, "rb") as f:
19+
manifest_data = tomllib.load(f)
20+
version_string = manifest_data['version']
3521

3622
PYLUXCORE_VERSION = '2.11.0-dev0' # specifies the version of pyluxcore that corresponds to this version of BlendLuxCore
3723

blender_manifest.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ id = "BlendLuxCore"
77
# I.e. MAJOR.MINOR.PATCH
88
# E.g.: "2.9.4": major: 2; minor: 9; patch: 3.
99
# or for pre-release versions: "2.9.4-alpha.1": major: 2; minor: 9; patch: 3; pre-release: alpha.1
10-
version = "2.11.0-dev0"
10+
version = "2.11.0-dev.0"
1111
name = "BlendLuxCore"
1212
tagline = "LuxCore"
1313
maintainer = "Johannes Hinrichs (CodeFHD)"

ui/addon_preferences.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,11 @@ def film_device_items_callback(self, context):
144144
lol_useragent: StringProperty(
145145
name="HTTP User-Agent",
146146
description="User Agent transmitted with requests",
147+
<<<<<<< HEAD
147148
default=f"BlendLuxCore/{utils.get_version_string()}",
149+
=======
150+
default = f"BlendLuxCore/{version_string}",
151+
>>>>>>> e1282839 (Remove obsolete bl_info dictionary, merge information into blender_manifest.toml and AUTHORS.txt)
148152
)
149153

150154
max_assetbar_rows: IntProperty(

0 commit comments

Comments
 (0)