From 45f4e9a4765eca160b68f00095945de022d48c2c Mon Sep 17 00:00:00 2001
From: iAmAsval <valentinbaudry64@gmail.com>
Date: Thu, 9 Dec 2021 23:22:00 +0100
Subject: [PATCH] material name before file name

---
 CUE4Parse                                 |  2 +-
 FModel/ViewModels/ModelViewerViewModel.cs | 10 ++++++----
 FModel/Views/ModelViewer.xaml             |  2 +-
 FModel/Views/Resources/Resources.xaml     |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CUE4Parse b/CUE4Parse
index cf93fb7a..1fc543a0 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit cf93fb7ad93af74994f736db6cc134250e165a53
+Subproject commit 1fc543a0434c8a2aa020443a377659fd4a908895
diff --git a/FModel/ViewModels/ModelViewerViewModel.cs b/FModel/ViewModels/ModelViewerViewModel.cs
index 40dbce11..1beaa10a 100644
--- a/FModel/ViewModels/ModelViewerViewModel.cs
+++ b/FModel/ViewModels/ModelViewerViewModel.cs
@@ -313,10 +313,11 @@ namespace FModel.ViewModels
 
             Application.Current.Dispatcher.Invoke(() =>
             {
+                var s = FixName(materialInstance.Name);
                 cam.Group3d.Add(new MeshGeometryModel3D
                 {
                     Transform = new RotateTransform3D(new AxisAngleRotation3D(new Vector3D(1,0,0), -90)),
-                    Name = FixName(materialInstance.Name), Geometry = builder.ToMeshGeometry3D(),
+                    Tag = s, Name = s, Geometry = builder.ToMeshGeometry3D(),
                     Material = m, IsTransparent = isTransparent, IsRendering = isRendering
                 });
             });
@@ -385,8 +386,9 @@ namespace FModel.ViewModels
                 {
                     cam.Group3d.Add(new MeshGeometryModel3D
                     {
-                        Name = FixName(unrealMaterial.Name), Geometry = builder.ToMeshGeometry3D(),
-                        Material = m, IsTransparent = isTransparent, IsRendering = isRendering
+                        Name = unrealMaterial.Name, Tag = FixName(section.MaterialName ?? unrealMaterial.Name),
+                        Geometry = builder.ToMeshGeometry3D(), Material = m, IsTransparent = isTransparent,
+                        IsRendering = isRendering
                     });
                 });
             }
@@ -585,7 +587,7 @@ namespace FModel.ViewModels
             if (int.TryParse(input[0].ToString(), out _))
                 input = input[1..];
 
-            return input.Replace('-', '_');
+            return input;
         }
 
         private bool CheckIfSaved(string path)
diff --git a/FModel/Views/ModelViewer.xaml b/FModel/Views/ModelViewer.xaml
index b0112861..7d51f26e 100644
--- a/FModel/Views/ModelViewer.xaml
+++ b/FModel/Views/ModelViewer.xaml
@@ -23,7 +23,7 @@
     </adonisControls:AdonisWindow.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" MinWidth="350" />
+            <ColumnDefinition Width="350" MinWidth="250" />
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="4*" />
         </Grid.ColumnDefinitions>
diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml
index 85343d22..34f64362 100644
--- a/FModel/Views/Resources/Resources.xaml
+++ b/FModel/Views/Resources/Resources.xaml
@@ -657,7 +657,7 @@
                         </Grid.ColumnDefinitions>
 
                         <Image Grid.Column="0" Source="/FModel;component/Resources/materialicon.png" Width="16" Height="16" Margin="5 0" HorizontalAlignment="Center" />
-                        <TextBlock Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Name}" TextTrimming="CharacterEllipsis" />
+                        <TextBlock Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Tag}" TextTrimming="CharacterEllipsis" />
                         <ToggleButton Grid.Column="3" IsChecked="{Binding IsRendering}" Padding="3" Style="{DynamicResource {x:Static adonisUi:Styles.ToolbarToggleButton}}">
                             <Viewbox Width="16" Height="16" HorizontalAlignment="Center">
                                 <Canvas Width="24" Height="24">