Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Helix upgrade to Dynamo 2.7 #10510

Merged
merged 39 commits into from
May 12, 2020
Merged

Helix upgrade to Dynamo 2.7 #10510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
c7e9143
Move to Helix 2.5.1 and SharpDX 4.2.0
mike-d-adsk Dec 11, 2018
fba0ef7
Merge remote-tracking branch 'origin' into helix-upgrade
mike-d-adsk Oct 10, 2019
73b36dc
Re-implement zoom in/out buttons
mike-d-adsk Oct 11, 2019
ae98cf6
Upgrade Helix to 2.9.0
mike-d-adsk Oct 11, 2019
d049ecc
Re-implement headlight outside of shader
mike-d-adsk Oct 22, 2019
4b04801
Remove Helix shader pipeline customizations, use default shaders (WIP)
mike-d-adsk Oct 22, 2019
ae0c2b0
Merge remote-tracking branch 'origin' into helix-upgrade
mike-d-adsk Oct 22, 2019
187e375
merge with master branch
aparajit-pratap Dec 2, 2019
3fd7d03
restore updating colors for selected and frozen node states
aparajit-pratap Dec 6, 2019
f5d42e6
Merge branch 'master' of github.com:DynamoDS/Dynamo into helix-upgrade
aparajit-pratap Dec 6, 2019
696c188
code cleanup
aparajit-pratap Dec 6, 2019
c953502
Use Viewport3DX.Items, enable geometry -> node selection
aparajit-pratap Dec 19, 2019
ba14838
Merge branch 'master' of github.com:DynamoDS/Dynamo into helix-upgrade
aparajit-pratap Dec 19, 2019
9f639bf
Merge branch 'upMaster' into helix-upgrade
mjkkirschner Jan 13, 2020
d1f0344
Helix upgrade basics (#10326)
mjkkirschner Jan 29, 2020
fa0f1bc
Merge branch 'helix-upgrade' of https://github.com/DynamoDS/Dynamo in…
mjkkirschner Jan 29, 2020
58d5116
Helix upgrade PR to merge the changes from the master branch (#10388)
reddyashish Feb 14, 2020
e81f34a
[DYN-2341] Labels on helix-update branch cause slow down (#10399)
reddyashish Feb 20, 2020
7749e31
DYN-2406: better handle pts/lines when selecting, freezing, and isola…
mjkkirschner Feb 20, 2020
9d5917d
fix alpha value for mesh colors in isolation mode. (#10405)
mjkkirschner Feb 20, 2020
6d89d72
Helix upgrade mastermerge (#10465)
mjkkirschner Mar 13, 2020
65612e0
Mesh display using shaders (#10462)
mjkkirschner Mar 18, 2020
fe42f38
Headlight bound to Camera LookDirection (#10466)
mjkkirschner Mar 19, 2020
b9d608f
special render packages should render with materials colors only (#10…
mjkkirschner Mar 20, 2020
96126de
Update ProtoGeometry.config (#10483)
mjkkirschner Mar 20, 2020
98b3fd9
Avoid rendering Gizmo multiple times on rotate (#10479)
mmisol Mar 20, 2020
d77d640
add 3d graphics image comparison tests (#10487)
mjkkirschner Mar 25, 2020
9d4bdff
target shader model 4 to avoid crash when user does not have GPU. (#1…
mjkkirschner Mar 25, 2020
1c4c98f
fix shader interpolation and make image comparison tests more toleran…
mjkkirschner Mar 27, 2020
08deea9
Merge branch 'master' into helix-upgrade
QilongTang Apr 1, 2020
a00047f
Merge branch 'master' into helix-upgrade
QilongTang Apr 6, 2020
7faf055
Handle memory outage on render (cherry pick) (#10569)
mmisol Apr 14, 2020
9af2463
Add Image Comparison Test for Surface. (#10579)
zeusongit Apr 17, 2020
a9f5bef
Merge branch 'master' into helix-upgrade
QilongTang Apr 30, 2020
4d713f2
Remove Dup entry
QilongTang Apr 30, 2020
fbab4a9
Comments
QilongTang May 8, 2020
9df9ff4
Comments
QilongTang May 8, 2020
a1465af
Comments
QilongTang May 8, 2020
f594a68
Revert test file name change
QilongTang May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extern/ProtoGeometry/ProtoGeometry.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<ProtoGeometryConfiguration xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<GeometryFactoryFileName>libg_221_0_0/LibG.ProtoInterface.dll</GeometryFactoryFileName>
<GeometryFactoryFileName>libg_225_0_0/LibG.ProtoInterface.dll</GeometryFactoryFileName>
</ProtoGeometryConfiguration>
95 changes: 36 additions & 59 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)/Config/CS.props" />
<Import Project="..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
<Import Project="..\packages\SharpDX.Toolkit.2.6.3\build\SharpDX.Toolkit.targets" Condition="Exists('..\packages\SharpDX.Toolkit.2.6.3\build\SharpDX.Toolkit.targets')" />
<Import Project="$(SolutionDir)/Config/Cleanup.targets" />
</ImportGroup>
<PropertyGroup>
Expand Down Expand Up @@ -43,9 +41,8 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cyotek.Drawing.BitmapFont, Version=1.0.2.0, Culture=neutral, PublicKeyToken=58daa28b0b2de221, processorArchitecture=MSIL">
<HintPath>..\packages\Cyotek.Drawing.BitmapFont.1.0.2.0\lib\net20\Cyotek.Drawing.BitmapFont.dll</HintPath>
<Private>True</Private>
<Reference Include="Cyotek.Drawing.BitmapFont, Version=1.0.0.0, Culture=neutral, PublicKeyToken=58daa28b0b2de221, processorArchitecture=MSIL">
<HintPath>..\packages\Cyotek.Drawing.BitmapFont.1.3.4\lib\net47\Cyotek.Drawing.BitmapFont.dll</HintPath>
</Reference>
<Reference Include="FontAwesome.WPF">
<HintPath>..\..\extern\FontAwesome\FontAwesome.WPF.dll</HintPath>
Expand All @@ -54,17 +51,14 @@
<Private>True</Private>
<HintPath>..\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll</HintPath>
</Reference>
<Reference Include="HelixToolkit, Version=2015.1.629.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
<HintPath>..\packages\HelixToolkit.2015.1.629\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll</HintPath>
<Private>True</Private>
<Reference Include="HelixToolkit, Version=2.9.0.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
<HintPath>..\packages\HelixToolkit.2.9.0\lib\netstandard1.1\HelixToolkit.dll</HintPath>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should instead aim for the latest version of Helix, which is 2.11. I'm pretty sure I heard @mjkkirschner mention that it worked just as well as 2.9 with Dynamo.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@QilongTang I didn't notice this was .net standard, does this have the same issue as the pythonNet net standard stuff and bring in a ton of type forwarding system binaries? We may want to try updating dynamo to 4.7.2 ASAP.

Copy link
Contributor Author

@QilongTang QilongTang May 8, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont see a tons of added system binaries in the built folder, but im not sure about the latest .11 version

</Reference>
<Reference Include="HelixToolkit.Wpf, Version=2015.1.629.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
<HintPath>..\packages\HelixToolkit.Wpf.2015.1.629\lib\net45\HelixToolkit.Wpf.dll</HintPath>
<Private>True</Private>
<Reference Include="HelixToolkit.Wpf, Version=2.9.0.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
<HintPath>..\packages\HelixToolkit.Wpf.2.9.0\lib\net45\HelixToolkit.Wpf.dll</HintPath>
</Reference>
<Reference Include="HelixToolkit.Wpf.SharpDX, Version=2015.1.629.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
<HintPath>..\packages\HelixToolkit.Wpf.SharpDX.2015.1.629\lib\net45\HelixToolkit.Wpf.SharpDX.dll</HintPath>
<Private>True</Private>
<Reference Include="HelixToolkit.Wpf.SharpDX, Version=2.9.0.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
<HintPath>..\packages\HelixToolkit.Wpf.SharpDX.2.9.0\lib\net45\HelixToolkit.Wpf.SharpDX.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.AvalonEdit, Version=4.3.1.9429, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -87,34 +81,30 @@
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
</Reference>
<Reference Include="SharpDX, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.dll</HintPath>
<Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
</Reference>
<Reference Include="SharpDX.D3DCompiler">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.D3DCompiler.dll</HintPath>
<HintPath>..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SharpDX.D3DCompiler, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" />
<Reference Include="SharpDX.D3DCompiler, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" />
<Reference Include="SharpDX.Direct2D1">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.Direct2D1.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Direct2D1, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" />
<Reference Include="SharpDX.Direct3D11, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.Direct3D11.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Direct3D11.Effects, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.Direct3D11.Effects.dll</HintPath>
<HintPath>..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SharpDX.Direct3D9, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.Direct3D9.dll</HintPath>
<Reference Include="SharpDX.Direct2D1, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" />
<Reference Include="SharpDX.Direct3D11, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll</HintPath>
</Reference>
<Reference Include="SharpDX.DXGI, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.DXGI.dll</HintPath>
<Reference Include="SharpDX.Direct3D9, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Toolkit, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.Toolkit.dll</HintPath>
<Reference Include="SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Toolkit.Graphics, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.Toolkit.Graphics.dll</HintPath>
<Reference Include="SharpDX.Mathematics, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand Down Expand Up @@ -172,6 +162,11 @@
<Compile Include="Extensions\ViewStartupParams.cs" />
<Compile Include="Interfaces\ILibraryViewCustomization.cs" />
<Compile Include="Interfaces\LayoutSpecification.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Utilities\CompactBubbleHandler.cs" />
<Compile Include="Interfaces\IShellCom.cs" />
<Compile Include="Rendering\HelixRenderPackage.cs" />
Expand All @@ -185,11 +180,6 @@
<Compile Include="UI\ClassObjectTemplateSelector.cs" />
<Compile Include="UI\DraggedAdorner.cs" />
<Compile Include="UI\HeaderTemplateSelector.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.en-US.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
Expand Down Expand Up @@ -337,7 +327,6 @@
</Compile>
<Compile Include="ViewModels\Watch3D\AttachedProperties.cs" />
<Compile Include="ViewModels\Watch3D\DynamoEffectsManager.cs" />
<Compile Include="ViewModels\Watch3D\DynamoRenderTechniquesManager.cs" />
<Compile Include="Views\Preview\CameraExtensions.cs" />
<Compile Include="Views\Preview\PreviewCompactView.xaml.cs">
<DependentUpon>PreviewCompactView.xaml</DependentUpon>
Expand Down Expand Up @@ -473,8 +462,8 @@
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.en-US.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
Expand Down Expand Up @@ -516,8 +505,8 @@
<None Include="UI\Fonts\OpenSans-SemiboldItalic.ttf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ViewModels\Watch3D\Resources\_dynamo.bfx" />
<None Include="ViewModels\Watch3D\Shaders\CompileShaders.bat" />
<None Include="ViewModels\Watch3D\compiledShaders\psDynamoMesh" />
<None Include="ViewModels\Watch3D\compiledShaders\vsDynamoMesh" />
<Resource Include="UI\Images\cursors.psd" />
<Resource Include="UI\Images\cursors1.psd" />
</ItemGroup>
Expand Down Expand Up @@ -1296,24 +1285,12 @@
<Resource Include="UI\Images\bubble-arrow.png" />
<Resource Include="UI\Images\icon-whats-new-small.png" />
<Resource Include="UI\Images\icon-dictionary-small.png" />
<Content Include="ViewModels\Watch3D\Shaders\BillboardText.fx" />
<Content Include="ViewModels\Watch3D\Shaders\Common.fx" />
<Content Include="ViewModels\Watch3D\Shaders\Custom.fx" />
<Content Include="ViewModels\Watch3D\Shaders\Default.fx" />
<Content Include="ViewModels\Watch3D\Shaders\Lines.fx" />
<Content Include="ViewModels\Watch3D\Shaders\Material.fx" />
<Content Include="ViewModels\Watch3D\Shaders\Points.fx" />
</ItemGroup>
<ItemGroup />
</ItemGroup>
<ItemGroup>
<Folder Include="ViewModels\Watch3D\shaderSource\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AfterBuild">
<MakeDir Directories="$(OutputPath)\viewExtensions\" />
</Target>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
<Error Condition="!Exists('..\packages\SharpDX.Toolkit.2.6.3\build\SharpDX.Toolkit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.Toolkit.2.6.3\build\SharpDX.Toolkit.targets'))" />
</Target>
</Project>
1 change: 1 addition & 0 deletions src/DynamoCoreWpf/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@
[assembly: InternalsVisibleTo("WorkspaceDependencyViewExtension")]
[assembly: InternalsVisibleTo("DocumentationBrowserViewExtension")]
[assembly: InternalsVisibleTo("SystemTestServices")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
QilongTang marked this conversation as resolved.
Show resolved Hide resolved
30 changes: 20 additions & 10 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions src/DynamoCoreWpf/Properties/Resources.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="_dynamo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\viewmodels\watch3d\resources\_dynamo.bfx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="AboutWindowCannotGetVersion" xml:space="preserve">
<value>Could not get version.</value>
<comment>To indicate not abe to get Dynamo version</comment>
Expand Down Expand Up @@ -2226,6 +2222,13 @@ Uninstall the following packages: {0}?</value>
<data name="CrashPromptGithubNewIssueTitle" xml:space="preserve">
<value>Crash report from Dynamo {0}</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="psDynamoMesh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\ViewModels\Watch3D\compiledShaders\psDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="vsDynamoMesh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\ViewModels\Watch3D\compiledShaders\vsDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="DynamoViewSettingsMenuShowCodeBlockNodeLineNumber" xml:space="preserve">
<value>Show CodeBlockNode Line Numbers</value>
</data>
Expand Down
11 changes: 7 additions & 4 deletions src/DynamoCoreWpf/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1974,10 +1974,6 @@ Do you want to install the latest Dynamo update?</value>
<data name="FolderNotWritableError" xml:space="preserve">
<value>You do not have write permission to {0}.</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="_dynamo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\viewmodels\watch3d\resources\_dynamo.bfx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ActionMember" xml:space="preserve">
<value>Action</value>
</data>
Expand Down Expand Up @@ -2226,6 +2222,13 @@ Uninstall the following packages: {0}?</value>
<data name="DynamoViewSettingMenuShowDataReportingDialogTooltip" xml:space="preserve">
<value>Display the dialog for user to pick agreement on data collecting.</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="psDynamoMesh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\ViewModels\Watch3D\compiledShaders\psDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="vsDynamoMesh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\ViewModels\Watch3D\compiledShaders\vsDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="DynamoViewSettingsMenuShowCodeBlockNodeLineNumber" xml:space="preserve">
<value>Show CodeBlockNode Line Numbers</value>
</data>
Expand Down
4 changes: 2 additions & 2 deletions src/DynamoCoreWpf/UI/Converters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2281,10 +2281,10 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
//whether this is the home space
if ((bool)value)
{
return homeColor.ToColor4();
return homeColor;
}

return customColor.ToColor4();
return customColor;
}

public object ConvertBack(object value, Type targetType, object parameter,
Expand Down
Loading