remove import_infix

not necessary and potentially confusing
This commit is contained in:
jrkb 2025-05-13 15:45:40 +02:00
parent fc9b1b65b0
commit 21480ee371

View file

@ -1234,9 +1234,6 @@ class ABC3D_OT_CreateFontFromObjects(bpy.types.Operator):
face_name: bpy.props.StringProperty( face_name: bpy.props.StringProperty(
default="Tender", default="Tender",
) )
import_infix: bpy.props.StringProperty(
default="_NM_Origin_Tender",
)
autodetect_names: bpy.props.BoolProperty( autodetect_names: bpy.props.BoolProperty(
default=True, default=True,
) )
@ -1254,11 +1251,10 @@ class ABC3D_OT_CreateFontFromObjects(bpy.types.Operator):
print(f"name could not be autodetected {name}") print(f"name could not be autodetected {name}")
print("split:") print("split:")
print(ifxsplit) print(ifxsplit)
return self.font_name, self.face_name, self.import_infix return self.font_name, self.face_name
detected_font_name = f"{ifxsplit[1]}_{ifxsplit[2]}" detected_font_name = f"{ifxsplit[1]}_{ifxsplit[2]}"
detected_face_name = ifxsplit[3] detected_face_name = ifxsplit[3]
detected_import_infix = f"{ifxsplit[1]}_{ifxsplit[2]}_{ifxsplit[3]}" return detected_font_name, detected_face_name
return detected_font_name, detected_face_name, detected_import_infix
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
@ -1269,7 +1265,7 @@ class ABC3D_OT_CreateFontFromObjects(bpy.types.Operator):
row = layout.row() row = layout.row()
row.prop(self, "autodetect_names") row.prop(self, "autodetect_names")
first_object_name = context.selected_objects[-1].name first_object_name = context.selected_objects[-1].name
self.font_name, self.face_name, self.import_infix = ( self.font_name, self.face_name = (
self.do_autodetect_names(first_object_name) self.do_autodetect_names(first_object_name)
) )
if self.autodetect_names: if self.autodetect_names:
@ -1313,10 +1309,9 @@ class ABC3D_OT_CreateFontFromObjects(bpy.types.Operator):
row.label(text="- 'colon_NM_Origin_Tender_2'") row.label(text="- 'colon_NM_Origin_Tender_2'")
box = layout.box() box = layout.box()
box.enabled = not self.autodetect_names box.enabled = not self.autodetect_names
box.prop(self, 'font_name') box.prop(self, "font_name")
box.prop(self, 'face_name') box.prop(self, "face_name")
box.prop(self, 'import_infix') layout.prop(self, "fix_common_misspellings")
layout.prop(self, 'fix_common_misspellings')
if self.fix_common_misspellings: if self.fix_common_misspellings:
for k in Font.known_misspellings: for k in Font.known_misspellings:
character = "" character = ""
@ -1341,11 +1336,6 @@ class ABC3D_OT_CreateFontFromObjects(bpy.types.Operator):
if fontcollection is None: if fontcollection is None:
fontcollection = bpy.data.collections.new("ABC3D") fontcollection = bpy.data.collections.new("ABC3D")
ifxsplit = self.import_infix.split('_')
# if len(ifxsplit) != 4:
# font_name = f"{ifxsplit[1]}_{ifxsplit[2]}"
# face_name = ifxsplit[3]
font_name = self.font_name font_name = self.font_name
face_name = self.face_name face_name = self.face_name