Merge branch 'blender-v4.4-release'
This commit is contained in:
@@ -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 = "",
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user