diff --git a/hecl/blender/hecl/sact/SACTAction.py b/hecl/blender/hecl/sact/SACTAction.py index 42007f88e..e7c2d17f8 100644 --- a/hecl/blender/hecl/sact/SACTAction.py +++ b/hecl/blender/hecl/sact/SACTAction.py @@ -54,7 +54,9 @@ def draw(layout, context): #layout.prop(linked_action, 'hecl_index', text="Index") #layout.prop(linked_action, 'hecl_anim_props', text="Props") layout.prop(linked_action, 'hecl_fps', text="Frame Rate") - layout.prop(context.scene, 'hecl_auto_remap', text="60-fps Remap") + row = layout.row() + row.prop(context.scene, 'hecl_auto_remap', text="60-fps Remap") + row.prop(linked_action, 'hecl_additive', text="Additive") diff --git a/hecl/blender/hecl/sact/__init__.py b/hecl/blender/hecl/sact/__init__.py index f55ffc8fd..43e484d19 100644 --- a/hecl/blender/hecl/sact/__init__.py +++ b/hecl/blender/hecl/sact/__init__.py @@ -252,6 +252,7 @@ def register(): bpy.utils.register_class(SACTData) bpy.types.Scene.hecl_sact_data = bpy.props.PointerProperty(type=SACTData) bpy.types.Action.hecl_fps = bpy.props.IntProperty(name='HECL Action FPS', default=30) + bpy.types.Action.hecl_additive = bpy.props.BoolProperty(name='HECL Additive Action', default=False) bpy.types.Scene.hecl_auto_remap = bpy.props.BoolProperty(name="Auto Remap", description="Enables automatic 60-fps time-remapping for playback-validation purposes", default=True, update=time_remap_update)