Oval stroke and fill material were stored in inverted order.

1 files changed, 14 insertions, 14 deletions

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 6627b4b7..086c1058 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -305,6 +305,20 @@ exports.Circle = Object.create(GeomObj, {
                 strokePrim1 = this.generateOvalRing(x, y, reverseRotMat, fillScaleMat, strokeScaleMat, nTriangles,  strokeMaterial2);
             }
 
+            if (strokePrim0) {
+                                strokeMaterial0.fitToPrimitive( strokePrim0 );
+
+                this._primArray.push( strokePrim0 );
+                this._materialNodeArray.push( strokeMaterial0.getMaterialNode() );
+            }
+
+            if (strokePrim1) {
+                                strokeMaterial2.fitToPrimitive( strokePrim1 );
+
+                this._primArray.push( strokePrim1 );
+                this._materialNodeArray.push( strokeMaterial2.getMaterialNode() );
+            }
+
             /////////////////////////////////////////////////////////////
             //  Fill
             fillMaterial = this.makeFillMaterial();
@@ -321,20 +335,6 @@ exports.Circle = Object.create(GeomObj, {
                 this._materialNodeArray.push( fillMaterial.getMaterialNode() );
             }
 
-            if (strokePrim0) {
-                                strokeMaterial0.fitToPrimitive( strokePrim0 );
-
-                this._primArray.push( strokePrim0 );
-                this._materialNodeArray.push( strokeMaterial0.getMaterialNode() );
-            }
-
-            if (strokePrim1) {
-                                strokeMaterial2.fitToPrimitive( strokePrim1 );
-
-                this._primArray.push( strokePrim1 );
-                this._materialNodeArray.push( strokeMaterial2.getMaterialNode() );
-            }
-
             world.updateObject(this);
         }
     },