Merge branch 'refs/heads/ninja-internal' into EricMerge

Conflicts:
	js/tools/Rotate3DToolBase.js
	js/tools/RotateStage3DTool.js
	js/tools/Translate3DToolBase.js
	js/tools/modifier-tool-base.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index 26ac42e9..743dab85 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -44,6 +44,9 @@ var BrushStroke = function GLBrushStroke() {
     this._strokeAngle = 0;
     this._strokeAmountSmoothing = 0;
 
+    // currently, brush does not support a fill region
+    this.canFill = false;
+
     //threshold that tells us whether two samples are too far apart
     this._MAX_SAMPLE_DISTANCE_THRESHOLD = 5;