izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
62,104 Commits 23 Branches 254 Tags
930e33cb4873ae02027182feb2c779fed4085a1f
Commit Graph

9 Commits

Author SHA1 Message Date
Mickael Gilabert
33fc896450 Fixed build 
#jira ue-72594
#rnx
#rb none

[CL 5820741 by Mickael Gilabert in Main branch]
 2019-04-10 10:21:04 -04:00
Krzysztof Narkowicz
d93c6c0fa9 Fixed FGeometryCollectionSceneProxy rendering assert. 
#jira UE-72116
#rb none

[CL 5650371 by Krzysztof Narkowicz in Main branch]
 2019-03-29 15:13:44 -04:00
rolando caloca
2b8c415f74 UE4.22 - Remove almost all of ENQUEUE_UNIQUE_RENDER_COMMAND_TWOPARAMETER 
#rb none
#jira
#rnx

#ROBOMERGE-OWNER: rolando.caloca
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 5054105 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5054376 by rolando caloca in Main branch]
 2019-02-18 18:35:01 -05:00
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
Marcus Wassmer
48cc6051f0 Merging //UE4/Dev-Main@4835686 to Dev-Rendering (//UE4/Dev-Rendering) 
#lockdown rolando.caloca
#rb none

[CL 4836748 by Marcus Wassmer in Dev-Rendering branch]
 2019-01-29 17:55:04 -05:00
Matt Collins
0b89cee61a FMeshBatchElement.PrimitiveUniformBuffer doesn't own the RHIResource. 
Now using the Collector to allocate a one frame resource so this stays alive.

#rb daniel.wright
#jira UE-67857

[CL 4685499 by Matt Collins in Dev-Rendering branch]
 2019-01-07 13:01:33 -05:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering) 
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
 2019-01-03 19:16:26 -05:00
Krzysztof Narkowicz
3a22b1aef5 Fixed FGeometryCollectionSceneProxy after merge from main. 
#rb none

[CL 4664859 by Krzysztof Narkowicz in Dev-Rendering branch]
 2018-12-16 00:01:59 -05:00
Marcus Wassmer
3c30baa4f9 Merging //UE4/Dev-Main@4661957 to Dev-Rendering (//UE4/Dev-Rendering) 
#rb none
Contains temporary removal of some FGeometryCollectionSceneProxy code that is not compatible with refactor.

[CL 4664599 by Marcus Wassmer in Dev-Rendering branch]
 2018-12-15 14:19:22 -05:00