Merge branch 'main' into rapidjson_update

darbyjohnston · web-flow · commit 4c4daea2562e · 2025-09-12T14:13:03.000-07:00
diff --git a/src/deps/Imath b/src/deps/Imath
@@ -1 +1 @@
-Subproject commit f65b01cc43f5fed10cf9e5d694244543ce8bf543
+Subproject commit fbcfb9833fe78277299080e8700fcf749a468bb0
diff --git a/src/opentimelineio/effect.h b/src/opentimelineio/effect.h
@@ -42,7 +42,7 @@ class Effect : public SerializableObjectWithMetadata
         _effect_name = effect_name;
     }
 
-    /// @brief Return whether the effect is enabed.
+    /// @brief Return whether the effect is enabled.
     bool enabled() const { return _enabled; };
 
     /// @brief Set whether the effect is enabled.
diff --git a/src/py-opentimelineio/opentimelineio/algorithms/timeline_algo.py b/src/py-opentimelineio/opentimelineio/algorithms/timeline_algo.py
@@ -24,7 +24,7 @@ def timeline_trimmed_to_range(in_timeline, trim_range):
 
     :param Timeline in_timeline: Timeline to trim
     :param TimeRange trim_range:
-    :returnd: New trimmed timeline
+    :returns: New trimmed timeline
     :rtype: Timeline
     """
     new_timeline = copy.deepcopy(in_timeline)
diff --git a/src/py-opentimelineio/opentimelineio/core/__init__.py b/src/py-opentimelineio/opentimelineio/core/__init__.py
@@ -279,7 +279,7 @@ class Foo(SerializableObject):
     :param str doc: field documentation
     :param Any default_value: default value to return if no field value is set yet
 
-    :return: property object
+    :returns: property object
     :rtype: :py:class:`property`
     """
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class Effect : public SerializableObjectWithMetadata`
`42`	`42`	`_effect_name = effect_name;`
`43`	`43`	`}`
`44`	`44`
`45`		`- /// @brief Return whether the effect is enabed.`
	`45`	`+ /// @brief Return whether the effect is enabled.`
`46`	`46`	`bool enabled() const { return _enabled; };`
`47`	`47`
`48`	`48`	`/// @brief Set whether the effect is enabled.`