Skip to content

Commit

Permalink
Merge remote-tracking branch 'bitbucket/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
zlovatt committed Jul 6, 2021
2 parents 1f24d66 + 8fad40f commit ebe6930
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions docs/item/projectitem.rst
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,8 @@ Argument Type Description
``startTime`` ``String`` Start time of subclip, in **Ticks**.
``endTime`` ``String`` End time of subclip, in **Ticks**.
``hasHardBoundaries`` ``Integer`` If ``1``, the user cannot extend `in` and `out`.
``takeAudio`` ``Integer`` If ``1``, use video from source.
``takeVideo`` ``Integer`` If ``1``, use video from source.
``takeAudio`` ``Integer`` If ``1``, use audio from source.
====================== =========== =======================

**Returns**
Expand Down Expand Up @@ -508,8 +508,8 @@ A footage interpretation structure, or ``0`` if unsuccessful.
| ``fieldType`` | Field type, one of the following: |
| | - -1 FIELDTYPE_DEFAULT |
| | - 0 FIELDTYPE_PROGRESSIVE |
| | - 1 ALPHACHANNEL_UPPERFIRST |
| | - 2 ALPHACHANNEL_LOWERFIRST |
| | - 1 FIELDTYPE_UPPERFIRST |
| | - 2 FIELDTYPE_LOWERFIRST |
+----------------------------+------------------------------------------------------------+
| ``ignoreAlpha`` | ``true`` or ``false``. |
+----------------------------+------------------------------------------------------------+
Expand Down Expand Up @@ -927,7 +927,7 @@ Argument Type Description

**Returns**

``0`` if successful.
``true`` if successful.

----

Expand Down
1 change: 1 addition & 0 deletions docs/sequence/componentparam.rst
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ Argument Type Description
- 6 ``kfInterpMode_Time``
- 7 ``kfInterpMode_TimeTransitionStart``
- 8 ``kfInterpMode_TimeTransitionEnd``
``updateUI`` ``boolean`` whether to update UI afterward
======================= =========== =======================

**Returns**
Expand Down

0 comments on commit ebe6930

Please sign in to comment.