rolando caloca 114a38cd22 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: lina.halper
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 4932643 in //UE4/Release-4.22/... via CL 4932685
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5019694 by rolando caloca in Dev-Anim branch]

2019-02-16 01:59:35 -05:00

..

Developer

Fixed warnings when workers are not ready yet.

2019-02-16 01:41:22 -05:00

Editor

Unshelved from pending changelist '4932645':

2019-02-16 01:59:35 -05:00

Programs

HTML5 - pthread_main.js name changed by emscripten 1.38.24 upgrade

2019-02-16 01:47:31 -05:00

Runtime

Unshelved from pending changelist '4932645':

2019-02-16 01:59:35 -05:00

ThirdParty

Fix non-unity compile error on Android, due to <cmath> undefining the "isfinite" macro defined by <math.h>. If <math.h> is included before <cmath>, PhysX headers fail to compile with an undefined symbol error.

2019-02-16 01:40:46 -05:00

UE4Client.Target.cs

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

UE4Editor.Target.cs

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

UE4Game.Target.cs

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

UE4Server.Target.cs

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00