LeenkxTeam/LNXSDK
3
3
Fork 4
Code Issues 16 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'More 4.3 + support' (#3) from Onek8/LNXSDK:main into main

Browse Source 
Reviewed-on: #3
This commit is contained in:
Onek8
2025-01-30 13:43:29 +00:00
parent 1958342a74 4c6df16aa7
commit 348d7bf343
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
leenkx/blender/lnx/props_ui.py
View File

@ -761,8 +761,10 @@ class LNX_PT_LeenkxPlayerPanel(bpy.types.Panel):
else: else:
if bpy.app.version < (3, 0, 0): if bpy.app.version < (3, 0, 0):
row.operator("lnx.stop", icon="CANCEL", text="") row.operator("lnx.stop", icon="CANCEL", text="")
else: elif bpy.app.version > (3, 0, 0) and bpy.app.version < (4, 3, 2):
row.operator("lnx.stop", icon="SEQUENCE_COLOR_01", text="") row.operator("lnx.stop", icon="SEQUENCE_COLOR_01", text="")
else:
row.operator("lnx.stop", icon="EVENT_MEDIASTOP", text="")
row.operator("lnx.clean_menu", icon="BRUSH_DATA") row.operator("lnx.clean_menu", icon="BRUSH_DATA")
col = layout.box().column() col = layout.box().column()
@ -1438,8 +1440,10 @@ class LNX_PT_TopbarPanel(bpy.types.Panel):
else: else:
if bpy.app.version < (3, 0, 0): if bpy.app.version < (3, 0, 0):
row.operator("lnx.stop", icon="CANCEL", text="") row.operator("lnx.stop", icon="CANCEL", text="")
else: elif bpy.app.version > (3, 0, 0) and bpy.app.version < (4, 3, 2):
row.operator("lnx.stop", icon="SEQUENCE_COLOR_01", text="") row.operator("lnx.stop", icon="SEQUENCE_COLOR_01", text="")
else:
row.operator("lnx.stop", icon="EVENT_MEDIASTOP", text="")
row.operator("lnx.clean_menu", icon="BRUSH_DATA", text="") row.operator("lnx.clean_menu", icon="BRUSH_DATA", text="")
row.operator("lnx.open_editor", icon="DESKTOP", text="") row.operator("lnx.open_editor", icon="DESKTOP", text="")
row.operator("lnx.open_project_folder", icon="FILE_FOLDER", text="") row.operator("lnx.open_project_folder", icon="FILE_FOLDER", text="")

9
leenkx/blender/lnx/write_data.py
View File

@ -490,7 +490,10 @@ class Main {
public static inline var voxelgiVoxelSize = """ + str(round(rpdat.lnx_voxelgi_size * 100) / 100) + """;""") public static inline var voxelgiVoxelSize = """ + str(round(rpdat.lnx_voxelgi_size * 100) / 100) + """;""")
if rpdat.rp_bloom: if rpdat.rp_bloom:
if bpy.app.version <= (4, 2, 4):
f.write(f"public static var bloomRadius = {bpy.context.scene.eevee.bloom_radius if rpdat.lnx_bloom_follow_blender else rpdat.lnx_bloom_radius};") f.write(f"public static var bloomRadius = {bpy.context.scene.eevee.bloom_radius if rpdat.lnx_bloom_follow_blender else rpdat.lnx_bloom_radius};")
else:
f.write(f"public static var bloomRadius = {rpdat.lnx_bloom_radius};")
if rpdat.lnx_rp_resolution == 'Custom': if rpdat.lnx_rp_resolution == 'Custom':
f.write(""" f.write("""
@ -664,10 +667,14 @@ const float ssgiStrength = """ + str(round(rpdat.lnx_ssgi_strength * 100) / 100)
if rpdat.rp_bloom: if rpdat.rp_bloom:
follow_blender = rpdat.lnx_bloom_follow_blender follow_blender = rpdat.lnx_bloom_follow_blender
eevee_settings = bpy.context.scene.eevee eevee_settings = bpy.context.scene.eevee
if bpy.app.version <= (4, 2, 4):
threshold = eevee_settings.bloom_threshold if follow_blender else rpdat.lnx_bloom_threshold threshold = eevee_settings.bloom_threshold if follow_blender else rpdat.lnx_bloom_threshold
strength = eevee_settings.bloom_intensity if follow_blender else rpdat.lnx_bloom_strength strength = eevee_settings.bloom_intensity if follow_blender else rpdat.lnx_bloom_strength
knee = eevee_settings.bloom_knee if follow_blender else rpdat.lnx_bloom_knee knee = eevee_settings.bloom_knee if follow_blender else rpdat.lnx_bloom_knee
else:
threshold = rpdat.lnx_bloom_threshold
strength = rpdat.lnx_bloom_strength
knee = rpdat.lnx_bloom_knee
f.write( f.write(
"""const float bloomThreshold = """ + str(round(threshold * 100) / 100) + """; """const float bloomThreshold = """ + str(round(threshold * 100) / 100) + """;