Commit Graph

4 Commits

Author SHA1 Message Date
james hopkin
9ce659f0e1 Compile fix for tools build
#ROBOMERGE-SOURCE: CL 8383026 via CL 8383185
#ROBOMERGE-BOT: (v403-8382528)

[CL 8383209 by james hopkin in Main branch]
2019-08-30 09:58:36 -04:00
jian ru
ced7e8883a Redo CL 8374078 to resolve merge conflict - Reduce FRealtimeGPUProfiler overhead
#rb Ben.Woodhouse,Jonas.Meyer,Rolando.Caloca


#ROBOMERGE-SOURCE: CL 8375899 via CL 8380119
#ROBOMERGE-BOT: (v402-8361577)

[CL 8380167 by jian ru in Main branch]
2019-08-29 19:40:50 -04:00
michal valient
bfdcead4ed Fixed dereferencing null ptr in FRealtimeGPUProfiler at exit
#jira UE-76546
#rb marcus.wassmer

#ROBOMERGE-SOURCE: CL 7277248 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)

[CL 7277251 by michal valient in Main branch]
2019-07-11 12:57:57 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00