Commit Graph

14 Commits

Author SHA1 Message Date
aurel cordonnier
e0ad4e25df Merge from Release-Engine-Test @ 16624776 to UE5/Main
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16625248 by aurel cordonnier in ue5-main branch]
2021-06-10 13:13:24 -04:00
david lesage
b6ba12c7d3 #jira none
Adds processing time control in CADWorker
The processing max time is based on the size of the file to process according to its format.
+ increase MaxRestartAllowed
+ add Neu format
#rb jeanluc.corenthin

#ROBOMERGE-OWNER: david.lesage
#ROBOMERGE-AUTHOR: david.lesage
#ROBOMERGE-SOURCE: CL 16393014 in //UE4/Release-4.27/... via CL 16393036
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v804-16311228)
#ROBOMERGE-CONFLICT from-shelf

[CL 16447119 by david lesage in ue5-main branch]
2021-05-25 09:39:58 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
david lesage
9c2c1a5546 #jira UE-90480
- fix DatasmithCADWorker launching without CAD_INTERFACE: avoid crash, log a message, return a specific code error
 - fix FDatasmithWorkerHandler::StartWorkerProcess: Test if the external process and extenal application are running (FProcHandle::IsValide is not enough to check if a process is well launch)
#rb johan.duparc

#ROBOMERGE-SOURCE: CL 12294185 in //UE4/Release-4.25/... via CL 12294191
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v668-12245121)

[CL 12296912 by david lesage in Main branch]
2020-03-19 11:03:37 -04:00
JeanMichel Dignard
84facd6d15 Copy from dev-enterprise cl 11097196
#rb none
#rnx

[CL 11099277 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-23 16:28:59 -05:00
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
Julien StJean
0967602090 Copy up //UE4/Dev-Enterprise/...at Changelist 10508152 to //UE4/Dev-Tools-Staging/...
#rb none

[CL 10508596 by Julien StJean in Dev-Tools-Staging branch]
2019-12-04 14:23:32 -05:00
david lesage
d329cd7ee7 #jira UE-84616
Fix Import DWG worker
KernelIO has to be initialized with its library Path. This path is known relative to the engine folder.
So this path has to be send to the worker.
#rb jeanluc.corenthin
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 10307237 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v593-10286020)

[CL 10307239 by david lesage in Main branch]
2019-11-19 09:54:49 -05:00
johan duparc
20fd21797b Datasmith: in solution, renamed Program/Enterprise to Program/Datasmith
#rb JeanMichel.Dignard
#jira none
#rnx

#ROBOMERGE-SOURCE: CL 10229353 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v590-10202696)

[CL 10229358 by johan duparc in Main branch]
2019-11-14 17:19:25 -05:00
david lesage
835df4b82c New DatasmithSceneGraphBuilder and DatasmithMeshBuilder based on FArchive
Huge simplication of the code
Stabilisation of CAD import
#Jira UE-83381, UE-83158
#rb johan.duparc

#ROBOMERGE-SOURCE: CL 10221316 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v590-10202696)

[CL 10221348 by david lesage in Main branch]
2019-11-14 15:19:47 -05:00
johan duparc
e65fec93f5 Move DatasmithCADWorker in Programs/Enterprise/Datasmith
#rb JeanLuc.Corenthin, David.Lesage
#rnx
#jira none

#ROBOMERGE-SOURCE: CL 10098762 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v586-10095595)

[CL 10098765 by johan duparc in Main branch]
2019-11-11 13:04:07 -05:00