nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'design_tools' into design_tools

Browse source
This commit is contained in:
Lars Brubaker 2018-06-09 10:58:37 -07:00 • committed by GitHub
commit 9600032c9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Library/Widgets/ListView/ListView.cs
View file

@ -442,7 +442,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
else else
{ {
// List items // List items
if (itemModel is ILibraryAssetStream contentModel) if (itemModel != null)
{ {
var activeContext = ApplicationController.Instance.DragDropData; var activeContext = ApplicationController.Instance.DragDropData;
if (activeContext.View3DWidget != null) if (activeContext.View3DWidget != null)

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 76c50f4ff0aac6f311a623cd7f0e7f1c75b1bfc9 Subproject commit 348da0aa18229337f690783386978b47751c1d54