Skip to content

Commit b3c6db0

Browse files
committed
Fixes for 3.1
1 parent 548090e commit b3c6db0

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

anim/actions.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,18 @@ def execute(self, context):
4141
obj.animation_data.action = action
4242

4343
# Set preview range. Use start and end markers if they exist
44-
context.scene.frame_preview_start = action.frame_range[0]
45-
context.scene.frame_preview_end = action.frame_range[1] #- 1
44+
context.scene.frame_preview_start = int(action.curve_frame_range[0])
45+
context.scene.frame_preview_end = int(action.curve_frame_range[1]) #- 1
4646
for marker in action.pose_markers:
47+
# This is ARP stuff, should remove eventually
4748
if marker.name.lower() == "start":
4849
context.scene.frame_preview_start = marker.frame
4950
elif marker.name.lower() == "end":
5051
context.scene.frame_preview_end = marker.frame
5152
context.scene.use_preview_range = True
5253

5354
if self.play:
54-
context.scene.frame_current = action.frame_range[0]
55+
context.scene.frame_current = int(action.curve_frame_range[0])
5556
bpy.ops.screen.animation_cancel(restore_frame=False)
5657
bpy.ops.screen.animation_play()
5758

anim/pose_blender.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ def key_pose_lib(self):
230230

231231
# Temporary datapath->fcurve map for fast searching
232232
fcurves_map = {fc.data_path:fc for fc in self.pose_lib.fcurves}
233-
start_frame, last_frame = self.pose_lib.frame_range
233+
start_frame, last_frame = self.pose_lib.curve_frame_range
234234

235235
# base_pose_name = self.pose_lib.pose_markers[0].name # TODO let user choose
236236

jobs/anim_export.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def resolve_source(source):
8989
self.new_fcurves.append((action, dst_fc))
9090

9191
log(f"Baking {desc}")
92-
for frame_idx in range(0, int(action.frame_range[1]) + 1):
92+
for frame_idx in range(0, int(action.frame_end) + 1):
9393
val = src_fc.evaluate(frame_idx)
9494
dst_fc.keyframe_points.insert(frame_idx, val)
9595

@@ -136,10 +136,10 @@ def resolve_source(source):
136136

137137
# TODO save this
138138
rig.animation_data.action = export_group.action
139-
context.scene.frame_preview_start = export_group.action.frame_range[0]
140-
context.scene.frame_preview_end = export_group.action.frame_range[1]
139+
context.scene.frame_preview_start = int(export_group.action.frame_start)
140+
context.scene.frame_preview_end = int(export_group.action.frame_end)
141141
context.scene.use_preview_range = True
142-
context.scene.frame_current = export_group.action.frame_range[0]
142+
context.scene.frame_current = context.scene.frame_preview_start
143143
bpy.context.evaluated_depsgraph_get().update()
144144

145145
markers = export_group.action.pose_markers

0 commit comments

Comments
 (0)