Skip to content

Commit

Permalink
Merge branch '1.4_maintenance'
Browse files Browse the repository at this point in the history
  • Loading branch information
johnhaddon committed Sep 20, 2024
2 parents da9bf1f + 17e0b00 commit d145003
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 7 deletions.
26 changes: 25 additions & 1 deletion Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,42 @@ Build
- Zstandard : Added version 1.5.0.
- Windows : Update compiler to Visual Studio 2022 / MSVC 17.8 / Runtime library 14.3.

1.4.x.x (relative to 1.4.12.0)
1.4.x.x (relative to 1.4.13.0)
=======



1.4.13.0 (relative to 1.4.12.0)
========

Improvements
------------

- NodeEditor, NameWidget : Invalid characters are automatically converted to `_` when renaming a node or plug, and `:` is no longer treated as invalid.

Fixes
-----

- SceneReader :
- Fixed loading of facevarying normals skinned with UsdSkel.
- Stopped loading USD `lightLinks` and `shadowLinks` collections as sets.
- USD asset paths on Windows now use `/` as the path separator, instead of `\`. Set `IECOREUSD_FORCE_ASSET_PATH_FORWARD_SLASH=0` to keep the previous behaviour.
- SceneWriter : Fixed crash when writing to a USD file that is already open elsewhere.
- Constraint : The `target` browser now shows locations from the `targetScene` if it has an input connection. Before it always showed locations from the main input.
- ImageInspector : Fixed broken UI caused by double-clicking in the Image tab.

API
---

- ScenePathPlugValueWidget : The `scenePathPlugValueWidget:scene` metadata now accepts a space-separated list of plugs, taking the first plug which has an input connection.
- VisibleSet : Added Python constructor with keyword arguments for `expansions`, `inclusions` and `exclusions`.
- ScriptNodeAlgo : Added new namespace with functions for managing shared UI state for GafferSceneUI.
- ContextAlgo : Deprecated. Use ScriptNodeAlgo instead.

Build
-----

- Cortex : Updated to version 10.5.9.4.

1.4.12.0 (relative to 1.4.11.0)
========
Expand Down
2 changes: 1 addition & 1 deletion python/GafferImageUI/ImageInspector.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def __init__( self, scriptNode, **kw ) :
GafferUI.PathListingWidget.defaultNameColumn,
GafferUI.StandardPathColumn( "Value", "image:value", sizeMode = GafferUI.PathColumn.SizeMode.Stretch )
],
displayMode = GafferUI.PathListingWidget.DisplayMode.List,
displayMode = GafferUI.PathListingWidget.DisplayMode.Tree,
selectionMode = GafferUI.PathListingWidget.SelectionMode.Cell,
horizontalScrollMode = GafferUI.ScrollMode.Automatic,
sortable = False,
Expand Down
9 changes: 4 additions & 5 deletions python/GafferUI/NameWidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,18 +125,17 @@ def __plugMetadataChanged( self, plug, key, reason ) :

class _Validator( QtGui.QValidator ) :

__invalidCharacters = re.compile( "[^A-Za-z_:0-9]" )

def __init__( self, parent ) :

QtGui.QValidator.__init__( self, parent )

def validate( self, input, pos ) :

input = input.replace( " ", "_" )
input = self.__invalidCharacters.sub( "_", input )
if len( input ) :
if re.match( "^(?!__)[A-Za-z_]+[A-Za-z_0-9]*$", input ) :
result = QtGui.QValidator.Acceptable
else :
result = QtGui.QValidator.Invalid
result = QtGui.QValidator.Acceptable
else :
result = QtGui.QValidator.Intermediate

Expand Down
1 change: 1 addition & 0 deletions src/Gaffer/GraphComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ namespace
/// \todo Relax restrictions to only disallow '.' and `/'? We originally had
/// these strict requirements because we accessed GraphComponent children
/// as attributes in Python, but that approach has long since gone.
/// When doing this, also update the validator in NameWidget.
bool validName( const std::string &name )
{
if( name.empty() )
Expand Down

0 comments on commit d145003

Please sign in to comment.