Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4837006 by chris gagnon in Dev-VR branch]

Engine/Source/Editor/ClassViewer/Private/SClassViewer.cpp

@@ -2171,7 +2171,7 @@ void SClassViewer::Construct(const FArguments& InArgs, const FClassViewerInitial
 	.MaxDesiredHeight(800.0f)
 	[
 		SNew(SBorder)
-		.BorderImage(FEditorStyle::GetBrush("Menu.Background"))
+		.BorderImage(FEditorStyle::GetBrush(InitOptions.bShowBackgroundBorder ? "ToolPanel.GroupBorder" : "NoBorder"))
 		[
 			SNew(SVerticalBox)
 			+SVerticalBox::Slot()

Engine/Source/Editor/ClassViewer/Public/ClassViewerModule.h

@@ -101,12 +101,14 @@ public:
 	/** The property this class viewer be working on. */
 	TSharedPtr<class IPropertyHandle> PropertyHandle;
 
-	/** true (the default) shows the view options at the bottom of the class picker*/
+	/** true (the default) shows the view options at the bottom of the class picker */
 	bool bAllowViewOptions;
 
+	/** true (the default) shows a background border behind the class viewer widget. */
+	bool bShowBackgroundBorder = true;
+
 	/** Defines additional classes you want listed in the "Common Classes" section for the picker. */
 	TArray<UClass*> ExtraPickerCommonClasses;
-
 public:
 
 	/** Constructor */