DarkRadiant: master 85c3e4db
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| greebo | greebo | master | 26.02.2023 06:20 | master 6fd1ae5f |
| Affected Issues | 0006261: Three-way merge produces duplicate primitives when a func_static is moved | |||
| Changeset | 0006261: When applying a primitive removal found in the diff between source and base, the primitive in the *target* map needs to be marked for removal | |||
| mod - libs/scene/merge/ThreeWayMergeOperation.cpp | Diff File | |||
