Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	Moose Development/Moose/Core/Zone.lua

Moose Development/Moose/Core/Zone.lua

@@ -2563,7 +2563,7 @@ function ZONE_POLYGON_BASE:ReFill(Color,Alpha)
     self.FillTriangles = {}
   end
   -- refill
-  for _, triangle in pairs(self._Triangles) do
+  for _,triangle in pairs(self._Triangles) do
       local draw_ids = triangle:Fill(coalition,color,alpha,nil)
       self.FillTriangles = draw_ids
       table.combine(self.DrawID, draw_ids)
@@ -3593,6 +3593,9 @@ do -- ZONE_ELASTIC
     -- Update polygon verticies from points.
     self._.Polygon=self:_ConvexHull(points)
           
+    self._Triangles = self:_Triangulate()
+    self.SurfaceArea = self:_CalculateSurfaceArea()
+
     if Draw~=false then
       if self.DrawID or Draw==true then
         self:UndrawZone()