mark satterthwaite 314182c6fd Fix a shadow warning from my 5448877 changes. ...

#jira UE-71748
#rb none
#lockdown cristina.riveron

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 5468066 in //UE4/Release-4.22/... via CL 5468080
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5481492 by mark satterthwaite in Dev-VR branch]

2019-03-20 14:19:39 -04:00

..

CocoaMenu.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

CocoaTextView.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

CocoaWindow.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

HIDInputInterface.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

HIDInputInterface.h

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MacApplication.cpp

Fix a shadow warning from my 5448877 changes.

2019-03-20 14:19:39 -04:00

MacApplicationErrorOutputDevice.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MacConsoleOutputDevice.cpp

Speculative fix for UE-70172. When closing the log window, stop processing additional log lines as soon DestroyConsole() is called

2019-03-06 19:23:50 -05:00

MacCursor.cpp

Added a command line option to override the cursor type on Mac for debugging (MacCursorTypeOverride)

2019-02-05 19:01:57 -05:00

MacPlatformApplicationMisc.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MacPlatformFramePacer.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MacPlatformSplash.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MacPlatformSurvey.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MacTextInputMethodSystem.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MacWindow.cpp

Use FMath::CeilToInt when calculating the resized Mac window width and height to make sure the window size matches its viewport size after changes to SlateRHIRenderer in CL 4969188

2019-02-28 16:59:34 -05:00