From e574f722864a246bad40d3f5a4e59f7ccb206ea9 Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Thu, 15 Mar 2012 14:33:48 -0700
Subject: update values in the PI from values of the selected brush stroke or
 pen tool path

---
 js/tools/BrushTool.js | 1 +
 js/tools/PenTool.js   | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'js/tools')

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index c93672a9..90010cdf 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -266,6 +266,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
                     var brushStroke = this._selectedBrushStroke;
                     if (brushStroke){
                         brushStroke.setWorld(world);
+                        brushStroke.setCanvas(newCanvas);
 
                         brushStroke.setPlaneMatrix(planeMat);
                         var planeMatInv = glmat4.inverse( planeMat, [] );
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index e239b3f1..779b7f16 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -467,9 +467,9 @@ exports.PenTool = Montage.create(ShapeTool, {
                     if (this.application.ninja.colorController.colorToolbar.stroke.webGlColor){
                         this._selectedSubpath.setStrokeColor(this.application.ninja.colorController.colorToolbar.stroke.webGlColor);
                     }
-                    //if (this.application.ninja.colorController.colorToolbar.fill.webGlColor){
-                    //    this._selectedSubpath.setFillColor(this.application.ninja.colorController.colorToolbar.fill.webGlColor);
-                    //}
+                    if (this.application.ninja.colorController.colorToolbar.fill.webGlColor){
+                        this._selectedSubpath.setFillColor(this.application.ninja.colorController.colorToolbar.fill.webGlColor);
+                    }
                 } //if this is a new path being rendered
 
                 this._selectedSubpath.makeDirty();
@@ -594,6 +594,7 @@ exports.PenTool = Montage.create(ShapeTool, {
 
                 var subpath = this._selectedSubpath; //new GLSubpath();
                 subpath.setWorld(world);
+                subpath.setCanvas(newCanvas);
                 subpath.setPlaneMatrix(planeMat);
                 var planeMatInv = glmat4.inverse( planeMat, [] );
                 subpath.setPlaneMatrixInverse(planeMatInv);
@@ -614,7 +615,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                     if(strokeColor) {
                         newCanvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
                     }
-                    newCanvas.elementModel.shapeModel.strokeMaterial = this._selectedBrushStroke.getStrokeMaterial();
+                    newCanvas.elementModel.shapeModel.strokeMaterial = subpath.getStrokeMaterial();
 
                     newCanvas.elementModel.shapeModel.GLGeomObj = subpath;
                     newCanvas.elementModel.shapeModel.useWebGl = this.options.use3D;
-- 
cgit v1.2.3