materials + skeleton fix

4sval · Dec 18, 2021 · 227dafa · 227dafa
1 parent 609e3e6
commit 227dafa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -752,9 +752,9 @@ private void SaveExport(UObject export)
  }
  else
  {
- Log.Error("{FileName} could not be saved", savedFileName);
- FLogger.AppendError();
- FLogger.AppendText($"Could not save '{savedFileName}'", Constants.WHITE, true);
+ Log.Warning("{FileName} could not be saved", export.Name);
+ FLogger.AppendWarning();
+ FLogger.AppendText($"Could not save '{export.Name}'", Constants.WHITE, true);
  }
  }
 

diff --git a/FModel/ViewModels/MapViewerViewModel.cs b/FModel/ViewModels/MapViewerViewModel.cs
@@ -375,9 +375,9 @@ private async Task LoadBrMiniMap()
  await _threadWorkerView.Begin(_ =>
  {
  if (!Utils.TryLoadObject("FortniteGame/Content/UI/IngameMap/UIMapManagerBR.Default__UIMapManagerBR_C", out UObject mapManager) ||
- !mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") || mapMaterial.ReferencedTextures.Count < 1) return;
+ !mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") || mapMaterial.GetFirstTexture() is not UTexture2D tex) return;
 
- _bitmaps[0][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap(mapMaterial.ReferencedTextures[0] as UTexture2D), IsEnabled = true};
+ _bitmaps[0][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap(tex), IsEnabled = true};
  _brMiniMapImage = GetImageSource(_bitmaps[0][_FIRST_BITMAP].Layer);
  });
  }
@@ -390,9 +390,9 @@ private async Task LoadPrMiniMap()
  await _threadWorkerView.Begin(_ =>
  {
  if (!Utils.TryLoadObject("FortniteGame/Content/UI/IngameMap/UIMapManagerPapaya.Default__UIMapManagerPapaya_C", out UObject mapManager) ||
- !mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") || mapMaterial.ReferencedTextures.Count < 1) return;
+ !mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") || mapMaterial.GetFirstTexture() is not UTexture2D tex) return;
 
- _bitmaps[1][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap(mapMaterial.ReferencedTextures[0] as UTexture2D), IsEnabled = true};
+ _bitmaps[1][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap(tex), IsEnabled = true};
  _prMiniMapImage = GetImageSource(_bitmaps[1][_FIRST_BITMAP].Layer);
  });
  }

diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml
@@ -944,7 +944,7 @@
  </MenuItem.Icon>
  </MenuItem>
  <Separator />
- <MenuItem Header="Jump to Asset Folder" Command="{Binding GoToCommand}" CommandParameter="{Binding Directory}">
+ <MenuItem Header="Jump to Package Folder" Command="{Binding GoToCommand}" CommandParameter="{Binding Directory}">
  <MenuItem.Icon>
  <Viewbox Width="16" Height="16">
  <Canvas Width="24" Height="24">
@@ -953,7 +953,7 @@
  </Viewbox>
  </MenuItem.Icon>
  </MenuItem>
- <MenuItem Header="Copy Asset Name" Command="{Binding TabCommand}" CommandParameter="Copy_Asset_Name">
+ <MenuItem Header="Copy Package Name" Command="{Binding TabCommand}" CommandParameter="Copy_Asset_Name">
  <MenuItem.Icon>
  <Viewbox Width="16" Height="16">
  <Canvas Width="24" Height="24">