LeenkxTeam/LNXSDK
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: LeenkxTeam:348d7bf34304b8cb283686347b32d0e5a606e8a0
Branches Tags
LeenkxTeam:main
..
compare: LeenkxTeam:1958342a7405b187229003dc6ece3aa614c338cd
Branches Tags
LeenkxTeam:main

No commits in common. "348d7bf34304b8cb283686347b32d0e5a606e8a0" and "1958342a7405b187229003dc6ece3aa614c338cd" have entirely different histories.
348d7bf343 ... 1958342a74

2 changed files with 7 additions and 18 deletions
Show Stats Expand all files Collapse all files

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

@ -761,10 +761,8 @@ 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="")
elif bpy.app.version > (3, 0, 0) and bpy.app.version < (4, 3, 2):
row.operator("lnx.stop", icon="SEQUENCE_COLOR_01", text="")
else: else:
row.operator("lnx.stop", icon="EVENT_MEDIASTOP", text="") row.operator("lnx.stop", icon="SEQUENCE_COLOR_01", 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()
@ -1440,10 +1438,8 @@ 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="")
elif bpy.app.version > (3, 0, 0) and bpy.app.version < (4, 3, 2):
row.operator("lnx.stop", icon="SEQUENCE_COLOR_01", text="")
else: else:
row.operator("lnx.stop", icon="EVENT_MEDIASTOP", text="") row.operator("lnx.stop", icon="SEQUENCE_COLOR_01", 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="")

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

@ -490,10 +490,7 @@ 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("""
@ -667,14 +664,10 @@ 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) + """;