DarkRadiant: master 440a55df

Diff Back to Repository
Author Committer Branch Timestamp Parent
greebo greebo master 18.06.2021 08:34 master 0ab693c9
Affected Issues  0005643: Three-Way Map Merge
Changeset 0005643: Restructure the whole process into two phases.
Phase 1 will detect any name conflicts that will occur during merge and will adjust the entity names accordingly (using Namespace algorithms).
Phase 2 will create the actions necessary to bring the source changes into the target scene.
Start preparing the corresponding unit test.
mod - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.h Diff File
mod - test/MapMerging.cpp Diff File
mod - test/resources/tdm/maps/threeway_merge_base.mapx Diff File
mod - test/resources/tdm/maps/threeway_merge_source_2.mapx Diff File
mod - test/resources/tdm/maps/threeway_merge_target_2.mapx Diff File