6 files changed, 93 insertions, 147 deletions

diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index ebbfbffa..3200b01c 100644
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -174,6 +174,22 @@ exports.Combobox = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
+            if( (this._value === null) && this._items.length )
+            {
+                var current = this._items[0];
+                if(this.dataFunction)
+                {
+                    this.value = this.dataFunction(current);
+                }
+                else if(this.dataField)
+                {
+                    this.value = current[this.dataField];
+                }
+                else
+                {
+                    this.value = current;
+                }
+            }
             this.element.addEventListener("change", this, false);
         }
     }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 21373aca..c6722dee 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -108,7 +108,15 @@ exports.ShapesController = Montage.create(CanvasController, {
                     return this.getShapeProperty(el, p);
                 case "strokeMaterial":
                 case "fillMaterial":
-                    return this.getShapeProperty(el, p).getName();
+                    var m = this.getShapeProperty(el, p);
+                    if(m)
+                    {
+                        return this.getShapeProperty(el, p).getName();
+                    }
+                    else
+                    {
+                        return "FlatMaterial";
+                    }
                 default:
                     return CanvasController.getProperty(el, p);
             }
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index fc2e6460..e6bcba89 100644
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -33,14 +33,6 @@ function GLCircle()
 
                 this._ovalHeight = this._ovalHeight = 2.0*this.radius;
 
-                // stroke and fill colors
-                this._strokeColor = [0.4, 0.4, 0.4, 1.0];
-                this._fillColor = [0.0, 0.6,  0.0,  1.0];
-
-                // stroke and fill materials
-                this._fillMaterial;
-                this._strokeMaterial;
-
                 this._strokeStyle = "Solid";
 
                 this._aspectRatio = 1.0;
@@ -189,19 +181,19 @@ function GLCircle()
                 var reverseRotMat = Matrix.RotationZ( -angle );
 
                 // calculate matrices to scale the circle and stroke to fit the bounds of the ellipse
-                strokeScaleMat = Matrix.I(4);
+                var strokeScaleMat = Matrix.I(4);
                 strokeScaleMat[0] = xRad;
                 strokeScaleMat[5] = yRad;
 
-                fillScaleMat = Matrix.I(4);
+                var fillScaleMat = Matrix.I(4);
                 fillScaleMat[0] = xRad - xStroke;
                 fillScaleMat[5] = yRad - yStroke;
 
-                innerRadiusScaleMat = Matrix.I(4);
+                var innerRadiusScaleMat = Matrix.I(4);
                 innerRadiusScaleMat[0] = xInnRad;
                 innerRadiusScaleMat[5] = yInnRad;
 
-                innerStrokeScaleMat = Matrix.I(4);
+                var innerStrokeScaleMat = Matrix.I(4);
                 innerStrokeScaleMat[0] = xInnRad - xStroke;
                 innerStrokeScaleMat[5] = yInnRad - yStroke;
 
@@ -233,69 +225,24 @@ function GLCircle()
 
                 if (fillPrim)
                 {
-                        this._primArray.push(   fillPrim  );
-
-                        if (this.getFillMaterial())
-                                fillMaterial = this.getFillMaterial().dup();
-                        else
-                                fillMaterial = new FlatMaterial();
+            fillMaterial = this.makeFillMaterial();
 
-                        if (fillMaterial)
-                        {
-                                fillMaterial.init( this.getWorld() );
-                if(!this.getFillMaterial() && this._fillColor)
-                {
-                    fillMaterial.setProperty("color", this._fillColor);
-                }
-                                this._materialArray.push( fillMaterial );
-                                this._materialTypeArray.push( "fill" );
-                                var matNode = fillMaterial.getMaterialNode();
-                                this._materialNodeArray.push( matNode );
-                        }
+            this._primArray.push( fillPrim );
+            this._materialNodeArray.push( fillMaterial.getMaterialNode() );
                 }
                 if (strokePrim0)
                 {
-                        if (this.getStrokeMaterial())
-                                strokeMaterial = this.getStrokeMaterial().dup();
-                        else
-                                strokeMaterial = new FlatMaterial();
+            strokeMaterial0 = this.makeStrokeMaterial();
 
-                        if (strokeMaterial)
-                        {
-                                strokeMaterial.init( this.getWorld() );
-                if(!this.getStrokeMaterial() && this._strokeColor)
-                {
-                    strokeMaterial.setProperty("color", this._strokeColor);
-                }
-                                this._primArray.push( strokePrim0 );
-
-                                var materialNode = createMaterialNode("ovalFillMaterial");
-                                this._materialArray.push( strokeMaterial );
-                                this._materialTypeArray.push( "stroke" );
-                                this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
-                        }
+            this._primArray.push( strokePrim0 );
+            this._materialNodeArray.push( strokeMaterial0.getMaterialNode() );
                 }
                 if (strokePrim1)
                 {
-                        if (this.getStrokeMaterial())
-                                strokeMaterial = this.getStrokeMaterial().dup();
-                        else
-                                strokeMaterial = new FlatMaterial();
+            strokeMaterial2 = this.makeStrokeMaterial();
 
-                        if (strokeMaterial)
-                        {
-                                strokeMaterial.init( this.getWorld() );
-                if(!this.getStrokeMaterial() && this._strokeColor)
-                {
-                    strokeMaterial.setProperty("color", this._strokeColor);
-                }
-                                this._primArray.push( strokePrim1 );
-
-                                var materialNode = createMaterialNode("ovalFillMaterial");
-                                this._materialArray.push( strokeMaterial );
-                                this._materialTypeArray.push( "stroke" );
-                                this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
-                        }
+            this._primArray.push( strokePrim1 );
+            this._materialNodeArray.push( strokeMaterial2.getMaterialNode() );
                 }
 
         world.updateObject(this);
diff --git a/js/helper-classes/RDGE/GLGeomObj.js b/js/helper-classes/RDGE/GLGeomObj.js
index 72019703..62fbf562 100644
--- a/js/helper-classes/RDGE/GLGeomObj.js
+++ b/js/helper-classes/RDGE/GLGeomObj.js
@@ -37,6 +37,10 @@ function GLGeomObj()
 
     this.m_world = null;
 
+    // stroke and fill colors
+    this._strokeColor;
+    this._fillColor;
+
         // stroke and fill materials
         this._fillMaterial;
         this._strokeMaterial;
@@ -104,6 +108,53 @@ function GLGeomObj()
         this.setFillColor   = function(c)               {  this.setMaterialColor(c, "fill");            }
         this.setStrokeColor = function(c)               {  this.setMaterialColor(c, "stroke");          }
 
+    this.makeStrokeMaterial = function()
+    {
+        var strokeMaterial;
+        if (this.getStrokeMaterial())
+            strokeMaterial = this.getStrokeMaterial().dup();
+        else
+            strokeMaterial = new FlatMaterial();
+
+        if (strokeMaterial)
+        {
+            strokeMaterial.init( this.getWorld() );
+            if(this._strokeColor)
+             {
+                strokeMaterial.setProperty("color", this._strokeColor);
+            }
+        }
+
+        this._materialArray.push( strokeMaterial );
+        this._materialTypeArray.push( "stroke" );