Rolando Caloca cea6ceff5a 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-SOURCE: CL 4932643 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4932685 by Rolando Caloca in Main branch]

2019-02-07 10:35:08 -05:00

..

Private/GeometryCollection

Unshelved from pending changelist '4932645':

2019-02-07 10:35:08 -05:00

Public/GeometryCollection

Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)

2019-01-03 19:16:26 -05:00

GeometryCollectionEngine.Build.cs

Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)

2019-01-03 19:16:26 -05:00