Resolved merge conflicts with changelog (cont.)

CHANGELOG.md

@@ -128,6 +128,8 @@
     Bug #6022: OpenMW-CS: Terrain selection is not updated when undoing/redoing terrain changes
     Bug #6023: OpenMW-CS: Clicking on a reference in "Terrain land editing" mode discards corresponding select/edit action
     Bug #6028: Particle system controller values are incorrectly used
+    Bug #6035: OpenMW-CS: Circle brush in "Terrain land editing" mode sometimes includes vertices outside its radius
+    Bug #6036: OpenMW-CS: Terrain selection at the border of cells omits certain corner vertices
     Bug #6043: Actor can have torch missing when torch animation is played
     Bug #6047: Mouse bindings can be triggered during save loading
     Feature #390: 3rd person look "over the shoulder"

CHANGELOG_PR.md

@@ -45,6 +45,8 @@ Editor Bug Fixes:
 - Terrain-selection grid is now properly updated when undoing/redoing terrain changes (#6022)
 - Tool outline and select/edit actions in "Terrain land editing" mode now ignore references (#6023)
 - Primary-select and secondary-select actions in "Terrain land editing" mode now behave like in "Instance editing" mode (#6024)
+- Using the circle brush to select terrain in the "Terrain land editing" mode no longer selects vertices outside the circle (#6035)
+- Vertices at the NW and SE corners of a cell can now also be selected in "Terrain land editing" mode if the adjacent cells aren't loaded yet (#6036)
 
 Miscellaneous:
 - Prevent save-game bloating by using an appropriate fog texture format (#5108)