2 Commits

Author	SHA1	Message	Date
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
Ryan Vance	7c51ff94af	Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR) ... CL 1 of 8 #rb integration [CL 4748712 by Ryan Vance in Dev-VR branch]	2019-01-17 18:54:05 -05:00