izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Content browser no longer builds it's package roots from full drive paths.

Browse Source 
#jira UE-32570
#rb Jamie.Dale

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 7708221 in //UE4/Release-4.23/... via CL 7708225
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7834926 by chris gagnon in Dev-Build branch]
This commit is contained in:
chris gagnon
2019-08-06 22:21:58 -04:00
parent 906e2dad0a e764afa8e8
commit 415227ee8a
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Engine/Source/Editor/ContentBrowser/Private/FrontendFilters.cpp
View File

@@ -1106,9 +1106,9 @@ FString FFrontendFilter_ArbitraryComparisonOperation::ConvertOperationToString(E
FFrontendFilter_ShowOtherDevelopers::FFrontendFilter_ShowOtherDevelopers(TSharedPtr<FFrontendFilterCategory> InCategory)
: FFrontendFilter(InCategory)
, BaseDeveloperPath(FPackageName::FilenameToLongPackageName(FPaths::GameDevelopersDir()))
, BaseDeveloperPath(TEXT("/Game/Developers/"))
, BaseDeveloperPathAnsi()
, UserDeveloperPath(FPackageName::FilenameToLongPackageName(FPaths::GameUserDeveloperDir()))
, UserDeveloperPath(BaseDeveloperPath + FPaths::GameUserDeveloperFolderName() + TEXT("/"))
, bIsOnlyOneDeveloperPathSelected(false)
, bShowOtherDeveloperAssets(false)
{

15
Engine/Source/Runtime/Core/Private/Misc/Paths.cpp
View File

@@ -418,18 +418,18 @@ FString FPaths::GameDevelopersDir()
return FPaths::ProjectContentDir() + TEXT("Developers/");
}
FString FPaths::GameUserDeveloperDir()
FString FPaths::GameUserDeveloperFolderName()
{
static FString UserFolder;
if ( UserFolder.Len() == 0 )
if (UserFolder.Len() == 0)
{
// The user folder is the user name without any invalid characters
const FString InvalidChars = INVALID_LONGPACKAGE_CHARACTERS;
const FString& UserName = FPlatformProcess::UserName();
UserFolder = UserName;
for (int32 CharIdx = 0; CharIdx < InvalidChars.Len(); ++CharIdx)
{
const FString Char = InvalidChars.Mid(CharIdx, 1);
@@ -437,7 +437,12 @@ FString FPaths::GameUserDeveloperDir()
}
}
return FPaths::GameDevelopersDir() + UserFolder + TEXT("/");
return UserFolder;
}
FString FPaths::GameUserDeveloperDir()
{
return FPaths::GameDevelopersDir() + GameUserDeveloperFolderName() + TEXT("/");
}
FString FPaths::DiffDir()

3
Engine/Source/Runtime/Core/Public/Misc/Paths.h
View File

@@ -296,6 +296,9 @@ public:
/** Returns the directory that contains subfolders for developer-specific content */
static FString GameDevelopersDir();
/** Returns The folder name for the developer-specific directory for the current user */
static FString GameUserDeveloperFolderName();
/** Returns The directory that contains developer-specific content for the current user */
static FString GameUserDeveloperDir();