rolando caloca 4584acbc2d Unshelved from pending changelist '4932645': ...

[CODEREVIEW] rolando.caloca,ben.marsh,cristina.riveron,nick.bullard,nick.penwarden

Merge conflict.
rolando.caloca, please merge this change by hand.
More info at https://robomerge.epicgames.net#RELEASE

/src/ROBOMERGE_RELEASE_Main/Engine/Plugins/FX/Niagara/Source/Niagara/Private/NiagaraEmitterInstanceBatcher.cpp - merging //UE4/Release-4.22/Engine/Plugins/FX/Niagara/Source/Niagara/Private/NiagaraEmitterInstanceBatcher.cpp#2


--------------------------------------
UE4.22 - Deprecate ENQUEUE_UNIQUE_RENDER_COMMAND_THREEPARAMETER
#rb none
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 4932643 in //UE4/Release-4.22/... via CL 4932685
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5019529 by rolando caloca in Dev-VR branch]

2019-02-16 01:57:06 -05:00

..

Private

Unshelved from pending changelist '4932645':

2019-02-16 01:57:06 -05:00

Public

Copying //UE4/Dev-Sequencer [at] 4773300 to Dev-Main (//UE4/Dev-Main)

2019-01-23 20:36:44 -05:00

MovieSceneCapture.Build.cs

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

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