1.6.2

Author: Nokaubure

__init__.py

@@ -34,7 +34,7 @@
 bl_info = {
     'name': 'Objex Exporter for N64 romhacking',
     'author': 'Campbell Barton, Bastien Montagne, OoT modding community',
-    'version': (2, 6, 1),
+    'version': (2, 6, 2),
     'blender': (2, 80, 0),
     'location': 'File > Export',
     'description': 'Allows to export to objex and provides new features for further customization',

export_objex_anim.py

@@ -297,14 +297,14 @@ def rad_to_shortang(r):
             if eyes_bone is not None:
                 i = round(eyes_bone.head.x) # Want it in armature space, not transform space
                 if i < -1 or i > 7:
-                    log.warning('Link eye index (Eyes bone X value) out of range -1 to 7')
+                    log.warning('Link eye index (Eyes bone X value) out of range -1 to 7, was {}', eyes_bone.head.x)
                     if i < -1 or i > 14:
                         i = -1
                 texanimvalue |= i+1
             if mouth_bone is not None:
                 i = round(mouth_bone.head.x)
                 if i < -1 or i > 3:
-                    log.warning('Link mouth index (Mouth bone X value) out of range -1 to 3')
+                    log.warning('Link mouth index (Mouth bone X value) out of range -1 to 3, was {}', eyes_bone.head.x)
                     if i < -1 or i > 14:
                         i = -1
                 texanimvalue |= (i+1) << 4

interface.py

@@ -546,6 +546,11 @@ def draw(self, context):
         if foldable_menu(box, context.scene.objex_bonus, "menu_global"):
             box.prop(context.scene.objex_bonus, 'blend_scale')
 
+        box = self.layout.box()
+        if foldable_menu(box, context.scene.objex_bonus, "menu_folding"):
+            if armature:
+                menu_draw_folding(box, armature, context)
+
 # material
 
 def stripPrefix(s, prefix):
@@ -1561,8 +1566,9 @@ def execute(self, context):
                 mat.node_tree.nodes["OBJEX_TransformUV1"].inputs[1].default_value = -mat.f3d_mat.tex1.S.shift
                 mat.node_tree.nodes["OBJEX_TransformUV1"].inputs[2].default_value = -mat.f3d_mat.tex1.T.shift
                 mat.node_tree.nodes["OBJEX_EnvColor"].inputs[1].default_value = mat.f3d_mat.env_color[3]
-                name = mat.node_tree.nodes["OBJEX_Texel1Texture"].image.name
-                bpy.data.images[name].objex_bonus.format = mat.f3d_mat.tex1.tex_format;
+                if mat.node_tree.nodes["OBJEX_Texel1Texture"].image:
+                    name = mat.node_tree.nodes["OBJEX_Texel1Texture"].image.name
+                    bpy.data.images[name].objex_bonus.format = mat.f3d_mat.tex1.tex_format
 
             mat.node_tree.nodes["OBJEX_PrimColor"].inputs[0].default_value = (mat.f3d_mat.prim_color[0],mat.f3d_mat.prim_color[1],mat.f3d_mat.prim_color[2],mat.f3d_mat.prim_color[3])
             mat.node_tree.nodes["OBJEX_PrimColor"].inputs[1].default_value = mat.f3d_mat.prim_color[3]
@@ -2158,6 +2164,8 @@ def menu_material(self, context):
                 sub_box.row().prop(data, "vertex_shading", expand=True)
                 sub_box.prop(data, "external_material_segment")
 
+
+
 class OBJEX_OT_set_pixels_along_uv_from_image_dimensions(bpy.types.Operator):
 
     bl_idname = "objex.set_pixels_along_uv_from_image_dimensions"
@@ -2190,6 +2198,26 @@ def execute(self, context):
                 node.inputs["Pixels along V"].default_value = image.size[1] * 2
         return {"FINISHED"}
 
+
+def menu_draw_folding(layout:bpy.types.UILayout, armature:bpy.types.Armature, context:bpy.types.Context):
+    box = layout
+    box.use_property_split = False
+    scene = context.scene
+    objex_scene = context.scene.objex_bonus
+    row = box.row()
+    row.alignment = 'CENTER'
+    row = box.row()
+    row.operator('objex.autofold_save_pose', text='Save pose')
+    row.operator('objex.autofold_restore_pose', text='Restore pose')
+    row = box.row()
+    row.operator('objex.autofold_fold_unfold', text='Fold').action = 'FOLD'
+    row.operator('objex.autofold_fold_unfold', text='Unfold').action = 'UNFOLD'
+    row.operator('objex.autofold_fold_unfold', text='Switch').action = 'SWITCH'
+    box.label(text='Default saved pose to use for folding:')
+    box.template_list('UI_UL_list', 'OBJEX_SavedPose', scene.objex_bonus, 'saved_poses', armature.data.objex_bonus, 'fold_unfold_saved_pose_index', rows=2)
+    box.operator('objex.autofold_delete_pose', text='Delete pose')
+
+
 classes = (
     OBJEX_UL_actions,
     OBJEX_PT_armature_prop,

properties.py

@@ -23,26 +23,25 @@
 from . import template
 
 def hexify(segment: str):
-    if len(segment) == 0:
+    if not segment:
         return ""
 
-    if segment.startswith("0x"):
-        if segment.startswith("0x0"):
-            if segment.endswith("000000"):
-                return segment
-            segment = segment + "000000"
-        else:
-            if not segment.endswith("000000"):
-                segment = segment + "000000"
-            segment = segment[:2] + "0" + segment[2:]
-    else:
-        if len(segment) > 1:
+    if not segment.startswith("0x"):
+        if len(segment) != 1 or segment.upper() not in "0123456789ABCDEF":
             return ""
-        segment = "0x0" + segment + "000000"
-    
-    slist = list(segment.upper())
-    slist[1] = 'x'
-    return ''.join(slist)
+        return "0x0" + segment.upper() + "000000"
+
+    hex_part = segment[2:].upper()
+
+    # If it already starts with 0x0, just pad to 8 digits
+    if segment.startswith("0x0"):
+        hex_part = hex_part.ljust(8, '0')
+        return "0x" + hex_part
+
+    # If it starts with 0x but not 0x0, insert the extra 0 and then pad
+    hex_part = "0" + hex_part
+    hex_part = hex_part.ljust(8, '0')
+    return "0x" + hex_part
 
 # scene
 class SavedPoseBone(bpy.types.PropertyGroup):
@@ -109,6 +108,7 @@ class ObjexSceneProperties(bpy.types.PropertyGroup):
     menu_joint = bpy.props.BoolProperty(name='Joint Sphere')
     menu_mesh = bpy.props.BoolProperty(name='Mesh')
     menu_global = bpy.props.BoolProperty(name='Export Settings')
+    menu_folding = bpy.props.BoolProperty(name='Folding')
     mode_menu = bpy.props.EnumProperty(
         items=[
             ('menu_mode_combiner',    'Combiner', '(A-B)*C+D',                'SHADING_RENDERED', 0),