Skip to content

Commit

Permalink
Merge pull request #6089 from ericmehl/whiteSpaceFixes
Browse files Browse the repository at this point in the history
Whitespace fixes
  • Loading branch information
johnhaddon authored Oct 15, 2024
2 parents 92cf97b + 7a54a74 commit e84f380
Show file tree
Hide file tree
Showing 24 changed files with 9 additions and 31 deletions.
1 change: 0 additions & 1 deletion python/GafferImage/Anaglyph.gfr
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,3 @@ __children["Anaglyph"]["Dot1"]["__uiPosition"].setValue( imath.V2f( 13.4827852,


del __children

1 change: 0 additions & 1 deletion python/GafferImageTest/scripts/createViews-1.4.10.0.gfr
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,3 @@ __children["CheckerboardRight"]["__uiPosition"].setValue( imath.V2f( 8.04854202,


del __children

1 change: 0 additions & 1 deletion python/GafferOSLTest/scripts/networkVersion-0.23.2.1.gfr
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,3 @@ __children["OutObject"].loadShader( "ObjectProcessing/OutObject", keepExistingVa


del __children

1 change: 0 additions & 1 deletion python/GafferOSLTest/scripts/oslObjectVersion-0.55.0.0.gfr
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ __children["OSLObject"]["__uiPosition"].setValue( imath.V2f( -5.3499999, -2.1500


del __children

16 changes: 8 additions & 8 deletions python/GafferOSLTest/shaders/typedDebugClosure.osl
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
surface typedDebugClosure()
{
Ci = u * debug( "f", "type", "float", "value", color( 1 ) ) +
color( P ) * debug( "p", "type", "point", "value", color( 1 ) ) +
color( P ) * debug( "v", "type", "vector", "value", color( 1 ) ) +
color( P ) * debug( "n", "type", "normal", "value", color( 1 ) ) +
color( P ) * debug( "c", "type", "color", "value", color( 1 ) ) +
color( P ) * debug( "p2", "type", "point2", "value", color( 1 ) ) +
color( P ) * debug( "v2", "type", "vector2", "value", color( 1 ) ) +
color( P ) * debug( "n2", "type", "normal2", "value", color( 1 ) ) +
color( P ) * debug( "uv", "type", "uv", "value", color( 1 ) )
color( P ) * debug( "p", "type", "point", "value", color( 1 ) ) +
color( P ) * debug( "v", "type", "vector", "value", color( 1 ) ) +
color( P ) * debug( "n", "type", "normal", "value", color( 1 ) ) +
color( P ) * debug( "c", "type", "color", "value", color( 1 ) ) +
color( P ) * debug( "p2", "type", "point2", "value", color( 1 ) ) +
color( P ) * debug( "v2", "type", "vector2", "value", color( 1 ) ) +
color( P ) * debug( "n2", "type", "normal2", "value", color( 1 ) ) +
color( P ) * debug( "uv", "type", "uv", "value", color( 1 ) )
;
}
1 change: 0 additions & 1 deletion python/GafferSceneTest/scripts/collectScenes-0.48.0.0.gfr
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ __children["CollectScenes"]["__uiPosition"].setValue( imath.V2f( 7.04915667, 3.8


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ __children["Expression"]["__expression"].setValue( 'parent["__out"]["p0"] = IECo


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ __children["Expression"]["__expression"].setValue( 'parent["__out"]["p0"] = IECo


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ __children["ShaderAssignment"]["filter"].setInput( __children["UnionFilter"]["ou


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@ __children["Box"]["__uiPosition"].setValue( imath.V2f( 1.89942265, -8.6056385 )


del __children

1 change: 0 additions & 1 deletion python/GafferSceneTest/scripts/lightTweaks-0.52.3.1.gfr
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ __children["LightTweaks2"]["__uiPosition"].setValue( imath.V2f( -0.399145961, -3


del __children

1 change: 0 additions & 1 deletion python/GafferSceneTest/scripts/parent-0.54.1.0.gfr
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,3 @@ __children["Cube"]["__uiPosition"].setValue( imath.V2f( 11.5, 12.2999992 ) )


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@ Gaffer.Metadata.registerValue( __children["Box"]["attributes_visibility"], 'desc


del __children

1 change: 0 additions & 1 deletion python/GafferSceneTest/scripts/sceneSwitch-0.49.1.0.gfr
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,3 @@ __children["SceneSwitch"]["__uiPosition"].setValue( imath.V2f( 0.0499954224, -2.


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ __children["ShaderAssignment"]["__uiPosition"].setValue( imath.V2f( -14.8000002,


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,3 @@ __children["expr"]["__expression"].setValue( 'parent["__out"]["p0"] = 0' )


del __children

1 change: 0 additions & 1 deletion python/GafferTest/scripts/arrayPlug-1.4.10.0.gfr
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,3 @@ __children["n"]["user"]["p"][3].setValue( 3 )


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ __children["BoxIn"].setup()


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,3 @@ Gaffer.Metadata.registerValue( __children["AddTen"]["enabled"], 'nodule:type', '


del __children

1 change: 0 additions & 1 deletion python/GafferTest/scripts/boxVersion-0.52.0.0.gfr
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,3 @@ __children["AddTen"]["sum"].setInput( __children["AddTen"]["BoxOut"]["__out"] )


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ __children["n"]["user"].addChild( Gaffer.StringPlug( "p", defaultValue = '', fla


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ __children["n"]["user"].addChild( Gaffer.StringPlug( "p", defaultValue = '', fla


del __children

Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,3 @@ __children["Box"]["__uiPosition"].setValue( imath.V2f( -9.04999924, 2.25000024 )


del __children

2 changes: 1 addition & 1 deletion src/GafferBindings/Serialisation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ std::string Serialisation::result() const

if( m_protectParentNamespace )
{
result += "\n\ndel __children\n\n";
result += "\n\ndel __children\n";
}

return result;
Expand Down

0 comments on commit e84f380

Please sign in to comment.