Skip to content

Commit 7e8e8bd

Browse files
committed
USDLightUI : Add RenderMan native parameters
1 parent 9712a20 commit 7e8e8bd

File tree

5 files changed

+65
-3
lines changed

5 files changed

+65
-3
lines changed

Changes.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ Improvements
77
- Crop : Added `Auto` mode for `areaSource`, automatically cropping to show only non-empty pixels.
88
- GraphEditor : Improved responsiveness of select-drag, by deferring NodeEditor update until the drag ends.
99
- RenderManOptions : Added `ri:progress` option to control logging of render progress.
10-
- USDLight : Added filters to control which plugs are visible. Renderer-based filters show or hide renderer-specific parameters. A second, general purpose text filter provides additional filtering based on the plug name.
10+
- USDLight :
11+
- Added filters to control which plugs are visible. Renderer-based filters show or hide renderer-specific parameters. A second, general purpose text filter provides additional filtering based on the plug name.
12+
- Added RenderMan-specific light parameters.
1113

1214
API
1315
---

bin/_gaffer.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ def setUpRenderMan() :
335335
appendToPath( rmanTree / "lib" / "plugins", "RMAN_RIXPLUGINPATH" )
336336
appendToPath( rmanTree / "lib" / "shaders", "OSL_SHADER_PATHS" )
337337
appendToPath( pluginRoot / "plugins", "RMAN_DISPLAYS_PATH" )
338+
prependToPath( rmanTree / "lib" / "usd_plugins" / "usdRiPxr" / "Resources", "PXR_PLUGINPATH_NAME" )
338339

339340
if sys.platform == "win32" :
340341
appendToPath( rmanTree / "bin", "IECORE_DLL_DIRECTORIES" )

python/GafferUSDUI/USDShaderUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def __label( plug ) :
114114

115115
property = __primProperty( plug )
116116
if property :
117-
return property.GetMetadata( "displayName" )
117+
return property.GetMetadata( "displayName" ) + ( " (RenderMan)" if plug.getName().startswith( "ri:" ) else "" )
118118

119119
return __sdrProperty( plug ).GetLabel() or None
120120

resources/graphics.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,8 @@
543543
"rendererArnoldOffIcon",
544544
"rendererCyclesOnIcon",
545545
"rendererCyclesOffIcon",
546+
"rendererRenderManOnIcon",
547+
"rendererRenderManOffIcon",
546548
],
547549

548550
},

resources/graphics.svg

Lines changed: 58 additions & 1 deletion
Loading

0 commit comments

Comments
 (0)