Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/RB-2.2' into RB-2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Jul 4, 2017
2 parents 8776b4f + b458c98 commit a981ee5
Show file tree
Hide file tree
Showing 14 changed files with 1,083 additions and 1,072 deletions.
10 changes: 5 additions & 5 deletions Documentation/source/_group.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ The first section in this manual describes the various options available from th

_prefs.rst
_groupImage.rst
_groupColor.rst
_groupDraw.rst
_groupTime.rst
_groupChannel.rst
_groupMerge.rst
_groupColor.rst
_groupFilter.rst
_groupTransform.rst
_groupTime.rst
_groupDraw.rst
_groupKeyer.rst
_groupMerge.rst
_groupTransform.rst
_groupViews.rst
_groupOther.rst
_groupExtra.rst
Expand Down
2 changes: 1 addition & 1 deletion Documentation/source/plugins/fr.inria.built-in.OneView.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ Controls
+---------------------------+----------+-----------+-------------------------------+
| Parameter / script name | Type | Default | Function |
+===========================+==========+===========+===============================+
| View / ``view`` | Choice | Main | View to take from the input |
| View / ``view`` | Choice |   | View to take from the input |
+---------------------------+----------+-----------+-------------------------------+
2 changes: 1 addition & 1 deletion Documentation/source/plugins/fr.inria.built-in.Precomp.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Controls
| | | | | |
| | | | | When unchecked, this node will output the image rendered by the node indicated in the "Output Node" parameter by rendering the full-tree of the sub-project. In that case no writing on disk will occur and the images will be cached with the same policy as if the nodes were used in the active project in the first place. |
+-------------------------------------------------+-----------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Write Node / ``writeNode`` | Choice | None | Choose here the Write node in the pre-comp from which to render images then specify a frame-range and hit the "Render" button. |
| Write Node / ``writeNode`` | Choice |   | Choose here the Write node in the pre-comp from which to render images then specify a frame-range and hit the "Render" button. |
+-------------------------------------------------+-----------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| First-Frame / ``first`` | Integer | 0 | The first-frame to render |
+-------------------------------------------------+-----------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
Expand Down
156 changes: 78 additions & 78 deletions Documentation/source/plugins/fr.inria.built-in.Read.rst

Large diffs are not rendered by default.

16 changes: 12 additions & 4 deletions Documentation/source/plugins/fr.inria.built-in.Roto.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,18 @@ Controls
+----------------------------------------------+-----------+------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Feather fall-off / ``featherFallOff`` | Double | 1 | Controls the rate at which the feather is applied on the selected shape(s). |
+----------------------------------------------+-----------+------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Source / ``sourceType`` | Choice | background | | Source color used for painting the stroke when the Reveal/Clone tools are used: |
| | | | | - foreground: the painted result at this point in the hierarchy |
| | | | | - background: the original image unpainted connected to bg |
| | | | | - backgroundN: the original image unpainted connected to bgN |
| Source / ``sourceType`` | Choice | background | | Source color used for painting the stroke when the Reveal/Clone tools are used. |
| | | | | **foreground**: The painted result at this point in the hierarchy. |
| | | | | **background**: The original image unpainted connected to bg. |
| | | | | **background 2**: The original image unpainted connected to bg1. |
| | | | | **background 3**: The original image unpainted connected to bg2. |
| | | | | **background 4**: The original image unpainted connected to bg3. |
| | | | | **background 5**: The original image unpainted connected to bg4. |
| | | | | **background 6**: The original image unpainted connected to bg5. |
| | | | | **background 7**: The original image unpainted connected to bg6. |
| | | | | **background 8**: The original image unpainted connected to bg7. |
| | | | | **background 9**: The original image unpainted connected to bg8. |
| | | | | **background 10**: The original image unpainted connected to bg9. |
+----------------------------------------------+-----------+------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Translate / ``cloneTranslate`` | Double | x: 0 y: 0 |   |
+----------------------------------------------+-----------+------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
Expand Down
16 changes: 12 additions & 4 deletions Documentation/source/plugins/fr.inria.built-in.RotoPaint.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,18 @@ Controls
+----------------------------------------------+-----------+------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Feather fall-off / ``featherFallOff`` | Double | 1 | Controls the rate at which the feather is applied on the selected shape(s). |
+----------------------------------------------+-----------+------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Source / ``sourceType`` | Choice | background | | Source color used for painting the stroke when the Reveal/Clone tools are used: |
| | | | | - foreground: the painted result at this point in the hierarchy |
| | | | | - background: the original image unpainted connected to bg |
| | | | | - backgroundN: the original image unpainted connected to bgN |
| Source / ``sourceType`` | Choice | background | | Source color used for painting the stroke when the Reveal/Clone tools are used. |
| | | | | **foreground**: The painted result at this point in the hierarchy. |
| | | | | **background**: The original image unpainted connected to bg. |
| | | | | **background 2**: The original image unpainted connected to bg1. |
| | | | | **background 3**: The original image unpainted connected to bg2. |
| | | | | **background 4**: The original image unpainted connected to bg3. |
| | | | | **background 5**: The original image unpainted connected to bg4. |
| | | | | **background 6**: The original image unpainted connected to bg5. |
| | | | | **background 7**: The original image unpainted connected to bg6. |
| | | | | **background 8**: The original image unpainted connected to bg7. |
| | | | | **background 9**: The original image unpainted connected to bg8. |
| | | | | **background 10**: The original image unpainted connected to bg9. |
+----------------------------------------------+-----------+------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Translate / ``cloneTranslate`` | Double | x: 0 y: 0 |   |
+----------------------------------------------+-----------+------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
Expand Down
Loading

0 comments on commit a981ee5

Please sign in to comment.