Skip to content

Commit fe7643e

Browse files
[#1363] Navigating effect keyframes & copy/paste mistake fix
all_marker_positions.append ==> positions.append in getTimelineObjectPositions(obj) Effect keyframes code by @SuslikV
1 parent 6826d08 commit fe7643e

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

src/windows/main_window.py

+20-5
Original file line numberDiff line numberDiff line change
@@ -1238,22 +1238,37 @@ def getTimelineObjectPositions(obj):
12381238
fps = get_app().project.get("fps")
12391239
fps_float = float(fps["num"]) / float(fps["den"])
12401240

1241-
clip_start_time=obj.data["position"]
1242-
clip_stop_time=obj.data["position"] + (obj.data["end"] - obj.data["start"])
1241+
clip_start_time = obj.data["position"]
1242+
clip_orig_time = clip_start_time - obj.data["start"]
1243+
clip_stop_time = clip_orig_time + obj.data["end"]
12431244

12441245
# add clip boundaries
1245-
all_marker_positions.append(clip_start_time)
1246-
all_marker_positions.append(clip_stop_time)
1246+
positions.append(clip_start_time)
1247+
positions.append(clip_stop_time)
12471248

12481249
# add all keyframes
12491250
for property in obj.data :
12501251
try :
12511252
for point in obj.data[property]["Points"] :
1252-
keyframe_time=(point["co"]["X"]-1)/fps_float - obj.data["start"] + obj.data["position"]
1253+
keyframe_time = (point["co"]["X"]-1)/fps_float - obj.data["start"] + obj.data["position"]
12531254
if keyframe_time > clip_start_time and keyframe_time < clip_stop_time :
12541255
positions.append(keyframe_time)
12551256
except (TypeError, KeyError):
12561257
pass
1258+
1259+
1260+
# Add all Effect keyframes
1261+
if "effects" in obj.data:
1262+
for effect_data in obj.data["effects"]:
1263+
for property in effect_data:
1264+
try:
1265+
for point in effect_data[property]["Points"]:
1266+
keyframe_time = (point["co"]["X"]-1)/fps_float + clip_orig_time
1267+
if keyframe_time > clip_start_time and keyframe_time < clip_stop_time:
1268+
positions.append(keyframe_time)
1269+
except (TypeError, KeyError):
1270+
pass
1271+
12571272
return positions
12581273

12591274
all_marker_positions = []

0 commit comments

Comments
 (0)