Merge branch 'master' of github.com:UnityTech/UIWidgets into filter_records

Runtime/ui/renderer/common/geometry/path/path.cs

                 return;
             }
             this._isNaiveRRect = isNaiveRRect && this._hasOnlyMoveTos();
-            if (this._isNaiveRRect) {
-                this._shapeHint = shapeHint;
-                this._rRectCorner = corner;
-            }
+            this._shapeHint = shapeHint;
+            this._rRectCorner = corner;
         }
         
         bool _hasOnlyMoveTos() {
             this.needCache = false;
             this.pathKey = 0;
             this._isNaiveRRect = false;
+            this._shapeHint = uiPathShapeHint.Other;
+            this._rRectCorner = 0;
         }
 
         void _reset() {

Runtime/ui/renderer/common/geometry/path/path_cache.cs

         }
 
         uiVertexUV _expandFill(float fringe) {
-            float aa = fringe;
+            float aa = this.canSkipAAHairline ? 0f : fringe;
             float woff = aa * 0.5f;
             var points = this._points;
             var paths = this._paths;
 
             uiList<Vector3> _strokeVertices = null;
             uiList<Vector2> _strokeUV = null;
-            if (aa > 0.0f && !this.canSkipAAHairline) {
+            if (aa > 0.0f) {
                 _strokeVertices = ObjectPool<uiList<Vector3>>.alloc();
                 _strokeUV = ObjectPool<uiList<Vector2>>.alloc();
                 cvertices = 0;