SiliconStudio.Assets.Diff.AssetMerge Class Reference

Merges asset differences. More...

Public Member Functions
delegate Diff3ChangeType	MergePolicyDelegate (Diff3Node node)
	A policy that returns the change to apply to the current Diff3Node. More...

Static Public Member Functions
static MergeResult	Merge (Asset assetBase, Asset assetFrom1, Asset assetFrom2, MergePolicyDelegate mergePolicy)
	Merges the specified assets from base and from2 into from1. More...
static MergeResult	Merge (AssetDiff assetDiff, MergePolicyDelegate mergePolicy, bool previewOnly=false)
	Merges the specified assets from base and from2 into from1. More...
static MergeResult	MergeWithExternalTool (Asset assetBase0, Asset assetFrom1, Asset assetFrom2)
	3-way merge assets using an external diff tool. More...

Properties
static string	DefaultMergeTool [get, set]
	Gets or sets the default merge tool exe filepath. More...

Detailed Description

Merges asset differences.

Definition at line 16 of file AssetMerge.cs.

Member Function Documentation

static MergeResult SiliconStudio.Assets.Diff.AssetMerge.Merge ( Asset  assetBase, Asset  assetFrom1, Asset  assetFrom2, MergePolicyDelegate  mergePolicy  )

static

Merges the specified assets from base and from2 into from1.

Parameters

assetBase	The asset base.
assetFrom1	The asset from1.
assetFrom2	The asset from2.
mergePolicy	The merge policy. See AssetMergePolicies for default policies.

Returns

The result of the merge.

Exceptions

System.ArgumentNullException

assetFrom1 or mergePolicy

Definition at line 72 of file AssetMerge.cs.

References SiliconStudio.Assets.AssetCloner.Clone().

static MergeResult SiliconStudio.Assets.Diff.AssetMerge.Merge ( AssetDiff  assetDiff, MergePolicyDelegate  mergePolicy, bool  previewOnly = false  )

static

Merges the specified assets from base and from2 into from1.

Parameters

assetDiff	A precomputed asset difference.
mergePolicy	The merge policy.
previewOnly	if set to true then the merge will not change the object.

Returns

MergePreviewResult.

Exceptions

System.ArgumentNullException

assetDiff or mergePolicy

Definition at line 89 of file AssetMerge.cs.

References SiliconStudio.Assets.Diff.AssetDiff.Asset1.

delegate Diff3ChangeType SiliconStudio.Assets.Diff.AssetMerge.MergePolicyDelegate

(

Diff3Node

node

)

A policy that returns the change to apply to the current Diff3Node.

Parameters

node

The node.

Returns

The type of merge for the node.

static MergeResult SiliconStudio.Assets.Diff.AssetMerge.MergeWithExternalTool ( Asset  assetBase0, Asset  assetFrom1, Asset  assetFrom2  )

static

3-way merge assets using an external diff tool.

Parameters

assetBase0	The asset base0.
assetFrom1	The asset from1.
assetFrom2	The asset from2.

Returns

The result of the merge.

Definition at line 147 of file AssetMerge.cs.

References SiliconStudio.Assets.AssetCloner.Clone(), and SiliconStudio.Assets.AssetSerializer.Load().

Property Documentation

string SiliconStudio.Assets.Diff.AssetMerge.DefaultMergeTool

staticgetset

Gets or sets the default merge tool exe filepath.

The default merge tool exe filepath.

Definition at line 57 of file AssetMerge.cs.

---

The documentation for this class was generated from the following file:

• D:/Projects/Bitbucket Hosting/DoxygenFilesAndSources/Paradox v1.0.0 beta06/sources/assets/SiliconStudio.Assets/Diff/AssetMerge.cs