aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/controllers/elements/shapes-controller.js2
-rw-r--r--js/helper-classes/RDGE/GLRectangle.js8
2 files changed, 5 insertions, 5 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index c6722dee..e764de4e 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -82,7 +82,7 @@ exports.ShapesController = Montage.create(CanvasController, {
82 if(fm) 82 if(fm)
83 { 83 {
84 el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm); 84 el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
85 el.elementModel.shapeModel.strokeMaterial = fm; 85 el.elementModel.shapeModel.fillMaterial = fm;
86 el.elementModel.shapeModel.GLGeomObj.buildBuffers(); 86 el.elementModel.shapeModel.GLGeomObj.buildBuffers();
87 } 87 }
88 break; 88 break;
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index 151b15a3..8535a683 100644
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -271,8 +271,8 @@ function GLRectangle()
271 271
272 // stroke 272 // stroke
273 var strokeMaterial = this.makeStrokeMaterial(); 273 var strokeMaterial = this.makeStrokeMaterial();
274 prim = this.createStroke([x,y], 2*xFill, 2*yFill, strokeSize, tlRadius, blRadius, brRadius, trRadius, strokeMaterial) 274 var strokePrim = this.createStroke([x,y], 2*xFill, 2*yFill, strokeSize, tlRadius, blRadius, brRadius, trRadius, strokeMaterial);
275 this._primArray.push( prim ); 275 this._primArray.push( strokePrim );
276 this._materialNodeArray.push( strokeMaterial.getMaterialNode() ); 276 this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
277 277
278 // fill 278 // fill
@@ -283,8 +283,8 @@ function GLRectangle()
283 xFill -= strokeSize; 283 xFill -= strokeSize;
284 yFill -= strokeSize; 284 yFill -= strokeSize;
285 var fillMaterial = this.makeFillMaterial(); 285 var fillMaterial = this.makeFillMaterial();
286 prim = this.createFill([x,y], 2*xFill, 2*yFill, tlRadius, blRadius, brRadius, trRadius, fillMaterial) 286 var fillPrim = this.createFill([x,y], 2*xFill, 2*yFill, tlRadius, blRadius, brRadius, trRadius, fillMaterial);
287 this._primArray.push( prim ); 287 this._primArray.push( fillPrim );
288 this._materialNodeArray.push( fillMaterial.getMaterialNode() ); 288 this._materialNodeArray.push( fillMaterial.getMaterialNode() );
289 289
290 world.updateObject(this); 290 world.updateObject(this);