From 211cba61a6f4718beccf68dc6545335ff1898332 Mon Sep 17 00:00:00 2001 From: Onek8 Date: Tue, 6 Oct 2026 11:34:17 -0700 Subject: [PATCH] Export Network Update --- leenkx/blender/lnx/exporter.py | 2 +- leenkx/blender/lnx/make.py | 4 ++-- leenkx/blender/lnx/props.py | 2 +- leenkx/blender/lnx/props_ui.py | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/leenkx/blender/lnx/exporter.py b/leenkx/blender/lnx/exporter.py index 1de115f0..e00908c7 100644 --- a/leenkx/blender/lnx/exporter.py +++ b/leenkx/blender/lnx/exporter.py @@ -224,7 +224,7 @@ class LeenkxExporter: if wrd.lnx_network == 'Enabled': cls.export_network = True cls.export_torrent = False - if wrd.lnx_torrent == 'Enabled': + if wrd.lnx_torrent == 'Enabled' and wrd.lnx_network != 'Disabled': cls.export_torrent = True @staticmethod diff --git a/leenkx/blender/lnx/make.py b/leenkx/blender/lnx/make.py index 5c43a7c1..6ee5b86a 100644 --- a/leenkx/blender/lnx/make.py +++ b/leenkx/blender/lnx/make.py @@ -248,7 +248,7 @@ def export_data_impl(fp, sdk_path): export_navigation = bpy.data.worlds['Lnx'].lnx_navigation != 'Disabled' export_ui = bpy.data.worlds['Lnx'].lnx_ui != 'Disabled' export_network = bpy.data.worlds['Lnx'].lnx_network != 'Disabled' - export_torrent = bpy.data.worlds['Lnx'].lnx_torrent != 'Disabled' + export_torrent = bpy.data.worlds['Lnx'].lnx_torrent != 'Disabled' and bpy.data.worlds['Lnx'].lnx_network != 'Disabled' assets.reset() mat_state.material_cache.clear() @@ -356,7 +356,7 @@ def export_data_impl(fp, sdk_path): if wrd.lnx_network == 'Enabled': export_network = True - if wrd.lnx_torrent == 'Enabled': + if wrd.lnx_torrent == 'Enabled' and wrd.lnx_network != 'Disabled': export_torrent = True modules = [] diff --git a/leenkx/blender/lnx/props.py b/leenkx/blender/lnx/props.py index a2752c9f..af32d39f 100644 --- a/leenkx/blender/lnx/props.py +++ b/leenkx/blender/lnx/props.py @@ -295,7 +295,7 @@ def init_properties(): bpy.types.World.lnx_torrent = EnumProperty( items=[('Disabled', 'Disabled', 'Disabled'), ('Enabled', 'Enabled', 'Enabled')], - name="Torrent", default='Disabled', description="Include Torrent (Leenkx) library", update=assets.invalidate_compiler_cache) + name="P2P", default='Disabled', description="Include P2P (Leenkx) library", update=assets.invalidate_compiler_cache) bpy.types.World.lnx_torrent_download_dir = StringProperty(name="Download Path", description="Directory torrent downloads are written to. Relative paths resolve against the project directory at runtime; absolute paths are used as-is", default="Downloads", subtype='DIR_PATH', update=assets.invalidate_compiler_cache) bpy.types.World.lnx_torrent_trackers = CollectionProperty(name="Torrent Trackers", description="Default torrent tracker announce URLs", type=bpy.types.PropertyGroup) bpy.types.World.lnx_torrent_trackers_index = IntProperty(name="Torrent Tracker Index", default=0) diff --git a/leenkx/blender/lnx/props_ui.py b/leenkx/blender/lnx/props_ui.py index 329c4509..4e58a95b 100644 --- a/leenkx/blender/lnx/props_ui.py +++ b/leenkx/blender/lnx/props_ui.py @@ -1358,7 +1358,8 @@ class LNX_PT_ProjectModulesPanel(bpy.types.Panel): layout.prop(wrd, 'lnx_navigation_engine') layout.prop(wrd, 'lnx_ui') layout.prop(wrd, 'lnx_network') - layout.prop(wrd, 'lnx_torrent') + if wrd.lnx_network != 'Disabled': + layout.prop(wrd, 'lnx_torrent') layout.prop_search(wrd, 'lnx_khafile', bpy.data, 'texts') layout.prop(wrd, 'lnx_project_root') @@ -1472,7 +1473,7 @@ class LNX_PT_LeenkxNetworkPanel(bpy.types.Panel): wrd = bpy.data.worlds['Lnx'] col = layout.column() - col.enabled = wrd.lnx_torrent != 'Disabled' + col.enabled = wrd.lnx_torrent != 'Disabled' and wrd.lnx_network != 'Disabled' col.prop(wrd, "lnx_torrent_download_dir") col.prop(wrd, "lnx_torrent_peer_timeout")