DarkRadiant: master 11ca5a5d

Author Committer Branch Timestamp Parent
greebo greebo master 15.06.2021 10:50 master 8bc51096
Affected Issues  0005643: Three-Way Map Merge
Changeset 0005643: Fix implementation for merging primitive changes into the target map
mod - libs/scene/merge/MergeOperation.cpp Diff File
mod - libs/scene/merge/MergeOperation.h Diff File
mod - libs/scene/merge/MergeOperationBase.cpp Diff File
mod - libs/scene/merge/MergeOperationBase.h Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.h Diff File
mod - test/MapMerging.cpp Diff File