merge upstream

This commit is contained in:
2025-05-30 21:46:34 +00:00
2 changed files with 3 additions and 3 deletions

View File

@ -234,7 +234,7 @@ def build():
wrd.compo_defs += '_CGrain' wrd.compo_defs += '_CGrain'
if rpdat.lnx_sharpen: if rpdat.lnx_sharpen:
wrd.compo_defs += '_CSharpen' wrd.compo_defs += '_CSharpen'
if bpy.utils.get_active_scene().view_settings.exposure != 0.0: if lnx.utils.get_active_scene().view_settings.exposure != 0.0:
wrd.compo_defs += '_CExposure' wrd.compo_defs += '_CExposure'
if rpdat.lnx_fog: if rpdat.lnx_fog:
wrd.compo_defs += '_CFog' wrd.compo_defs += '_CFog'

View File

@ -769,9 +769,9 @@ const vec3 compoLetterboxColor = vec3(""" + str(round(rpdat.lnx_letterbox_color[
"""const float compoSharpenStrength = """ + str(round(rpdat.lnx_sharpen_strength * 100) / 100) + """; """const float compoSharpenStrength = """ + str(round(rpdat.lnx_sharpen_strength * 100) / 100) + """;
""") """)
if bpy.utils.get_active_scene().view_settings.exposure != 0.0: if lnx.utils.get_active_scene().view_settings.exposure != 0.0:
f.write( f.write(
"""const float compoExposureStrength = """ + str(round(bpy.utils.get_active_scene().view_settings.exposure * 100) / 100) + """; """const float compoExposureStrength = """ + str(round(lnx.utils.get_active_scene().view_settings.exposure * 100) / 100) + """;
""") """)
if rpdat.lnx_fog: if rpdat.lnx_fog: