marc audy 6dcca61e2e Repair bad merge caused by a rename and then a re-add of the file in the same location ...

#jira
#rnx
[CODEREVIEW] Patrick.Boutot


#ROBOMERGE-SOURCE: CL 7841874 via CL 7860788
#ROBOMERGE-BOT: (v389-7813075)

[CL 7860836 by marc audy in Main branch]

2019-08-08 00:46:51 -04:00

..

Roles

Repair bad merge caused by a rename and then a re-add of the file in the same location

2019-08-08 00:46:51 -04:00

ILiveLinkClient.h

Add EvaluateFrameFromSource_AnyThread to LiveLink to evaluate a specific subject. Used for debugging. When requesting if a source is enabled, you can ask for the snapshot (took during the start of the frame) or the current value.

2019-08-05 15:17:08 -04:00

ILiveLinkSource.h

Back out changelist 7790661

2019-08-07 07:12:48 -04:00

ILiveLinkSubject.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00

LiveLinkController.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00

LiveLinkCurveRemapSettings.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00

LiveLinkCustomVersion.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00

LiveLinkFrameInterpolationProcessor.h

Add EvaluateFrameFromSource_AnyThread to LiveLink to evaluate a specific subject. Used for debugging. When requesting if a source is enabled, you can ask for the snapshot (took during the start of the frame) or the current value.

2019-08-05 15:17:08 -04:00

LiveLinkFramePreProcessor.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00

LiveLinkFrameTranslator.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00

LiveLinkPresetTypes.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00

LiveLinkRefSkeleton.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00

LiveLinkRole.h

Shutdown LiveLink sources when the engine close.

2019-06-18 14:32:41 -04:00

LiveLinkRoleTrait.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00

LiveLinkSourceFactory.h

Shutdown LiveLink sources when the engine close.

2019-06-18 14:32:41 -04:00

LiveLinkSourceSettings.h

Add EvaluateFrameFromSource_AnyThread to LiveLink to evaluate a specific subject. Used for debugging. When requesting if a source is enabled, you can ask for the snapshot (took during the start of the frame) or the current value.

2019-08-05 15:17:08 -04:00

LiveLinkSubjectSettings.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00

LiveLinkTypes.h

Add EvaluateFrameFromSource_AnyThread to LiveLink to evaluate a specific subject. Used for debugging. When requesting if a source is enabled, you can ask for the snapshot (took during the start of the frame) or the current value.

2019-08-05 15:17:08 -04:00

LiveLinkVirtualSubject.h

Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)

2019-06-07 11:22:52 -04:00