Skip to content

Commit

Permalink
Merge pull request #6184 from murraystevenson/renderPassEditorTooltip…
Browse files Browse the repository at this point in the history
…Improvements

RenderPassEditor : Small tooltip improvements
  • Loading branch information
johnhaddon authored Dec 12, 2024
2 parents 204aa88 + e186938 commit 4558478
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ Improvements
------------

- MergeScenes : Removed unnecessary temporary contexts.
- RenderPassEditor : Added support for entering custom values in the `Type` column. Custom types can be later configured with a downstream NameSwitch selecting based on the value of the `renderPass:type` option.
- RenderPassEditor :
- Added support for entering custom values in the `Type` column. Custom types can be later configured with a downstream NameSwitch selecting based on the value of the `renderPass:type` option.
- Columns that edit options now include the option name in their header tooltip.
- Improved description of `render:cameraExclusions` and `render:matteExclusions` options.

Fixes
-----
Expand Down
2 changes: 1 addition & 1 deletion python/GafferSceneUI/RenderPassEditor.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def registerOption( cls, groupKey, optionName, section = "Main", columnName = No
if not columnName :
columnName = optionLabel or optionName.split( ":" )[-1]

toolTip = "<h3>{}</h3>".format( optionLabel or columnName )
toolTip = "<h3>{}</h3> Option : <code>{}</code>".format( optionLabel or columnName, optionName )
optionDescription = Gaffer.Metadata.value( "option:" + optionName, "description" )
if optionDescription :
## \todo PathListingWidget's PathModel should be handling this instead.
Expand Down
8 changes: 8 additions & 0 deletions startup/GafferScene/standardOptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@
ray visibility. Camera visibility attributes authored in the scene take precedence
over this option.
Typically, this is used to exclude descendants of locations in `cameraInclusions`,
as locations not specified in `cameraInclusions` already default to being excluded
from camera ray visibility.
For shadow, reflection and reflectionAlpha pass types, this specifies objects that
cast shadows or reflections. Shadow or reflection visibility attributes authored
in the scene take precedence over this option.
Expand Down Expand Up @@ -209,5 +213,9 @@
A set expression that excludes the matched objects and their descendants from being
treated as matte (holdout) objects. Matte attributes authored in the scene take
precedence over this option.
Typically, this is used to exclude descendants of locations in `matteInclusions`,
as locations not specified in `matteInclusions` already default to not being
treated as matte objects.
"""
)

0 comments on commit 4558478

Please sign in to comment.