diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c index b9a57be42e3..a3e4a659434 100644 --- a/release/datafiles/userdef/userdef_default.c +++ b/release/datafiles/userdef/userdef_default.c @@ -77,7 +77,7 @@ const UserDef U_default = { .scrollback = 256, .node_margin = 40, .node_preview_res = 120, - .transopts = USER_TR_TOOLTIPS, + .transopts = USER_TR_TOOLTIPS | USER_TR_IFACE | USER_TR_REPORTS | USER_TR_NEWDATANAME, .menuthreshold1 = 5, .menuthreshold2 = 2, .app_template = "", diff --git a/scripts/addons_core/io_curve_svg/import_svg.py b/scripts/addons_core/io_curve_svg/import_svg.py index fb778868a88..0b2fe00e1e0 100644 --- a/scripts/addons_core/io_curve_svg/import_svg.py +++ b/scripts/addons_core/io_curve_svg/import_svg.py @@ -180,9 +180,6 @@ def SVGGetMaterial(color, context): materials = context['materials'] rgb_re = re.compile(r'^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,(\d+)\s*\)\s*$') - if color in materials: - return materials[color] - diff = None if color.startswith('#'): color = color[1:] @@ -206,6 +203,9 @@ def SVGGetMaterial(color, context): diffuse_color[1] = srgb_to_linearrgb(diffuse_color[1]) diffuse_color[2] = srgb_to_linearrgb(diffuse_color[2]) + if color in materials: + return materials[color] + mat = bpy.data.materials.new(name='SVGMat') mat.diffuse_color = (*diffuse_color, 1.0)