DarkRadiant: master 54b38fe9

Diff Back to Repository
Author Committer Branch Timestamp Parent
greebo greebo master 16.06.2021 03:42 master 3efa9b83
Affected Issues  0005643: Three-Way Map Merge
Changeset 0005643: Another test covering primitive handling of func_static entities
mod - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File
mod - test/MapMerging.cpp Diff File
mod - test/algorithm/Scene.h Diff File
add - test/resources/tdm/maps/threeway_merge_source_2.mapx Diff File
add - test/resources/tdm/maps/threeway_merge_target_2.mapx Diff File