[Bf-blender-cvs] [7aaebf31df0] master: Cycles: replace (tm) with unicode equivalent in UI

Xavier Hallade noreply at git.blender.org
Thu Oct 20 15:53:02 CEST 2022


Commit: 7aaebf31df034397f3b28ab12daac9d3177c0950
Author: Xavier Hallade
Date:   Thu Oct 20 15:49:36 2022 +0200
Branches: master
https://developer.blender.org/rB7aaebf31df034397f3b28ab12daac9d3177c0950

Cycles: replace (tm) with unicode equivalent in UI

It was already done for (TM) which is present in some GPU names on Windows.
Names on Linux ended up using (tm) instead:
https://gitlab.freedesktop.org/mesa/mesa/-/commit/91fec2657a0dcf9bc2e6d080d84a114ecde44382

===================================================================

M	intern/cycles/blender/addon/properties.py

===================================================================

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index b7ce76d8f44..425d123e9e6 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1651,6 +1651,7 @@ class CyclesPreferences(bpy.types.AddonPreferences):
             box.prop(
                 device, "use", text=device.name
                 .replace('(TM)', unicodedata.lookup('TRADE MARK SIGN'))
+                .replace('(tm)', unicodedata.lookup('TRADE MARK SIGN'))
                 .replace('(R)', unicodedata.lookup('REGISTERED SIGN'))
                 .replace('(C)', unicodedata.lookup('COPYRIGHT SIGN'))
             )



More information about the Bf-blender-cvs mailing list