From b6617ae946213139e89c31258c31d205edec3368 Mon Sep 17 00:00:00 2001 From: Maxime-Cots Date: Mon, 17 Feb 2025 18:31:53 +0100 Subject: [PATCH 1/2] Fix #134451: SVG: Reuse material data on SVG Import Reuse SVG Material and prevent creation of duplicate material multiple times. Issue occurred because the check for a duplicate material was placed too early. Co-authored-by: Nig3l Pull Request: https://projects.blender.org/blender/blender/pulls/134529 --- scripts/addons_core/io_curve_svg/import_svg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) From 3e77dd1e4625118bfe765d15273bfd7cd78f0886 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Mon, 17 Feb 2025 18:46:43 +0100 Subject: [PATCH 2/2] Fix: Enable Translation Options by Default This PR changes the default user preferences so that the Translation Options are enabled. Otherwise with fresh install changing language only translates tooltips. Pull Request: https://projects.blender.org/blender/blender/pulls/134649 --- release/datafiles/userdef/userdef_default.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c index 471d69fb29d..4417ea751b0 100644 --- a/release/datafiles/userdef/userdef_default.c +++ b/release/datafiles/userdef/userdef_default.c @@ -79,7 +79,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 = "",