Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

1 files changed, 5 insertions, 2 deletions

diff --git a/node_modules/montage/ui/select-input.reel/select-input.js b/node_modules/montage/ui/select-input.reel/select-input.js
index 98902cfb..220c3814 100644
--- a/node_modules/montage/ui/select-input.reel/select-input.js
+++ b/node_modules/montage/ui/select-input.reel/select-input.js
@@ -21,7 +21,10 @@ var SelectInput = exports.SelectInput =  Montage.create(NativeControl, {
     _selectedIndexes: {
         set: function(value) {
             this.__selectedIndexes = value;
-            this.needsDraw = this._synching || !this._fromInput;
+            if(this.needsDraw === false) {
+                this.needsDraw = this._synching || !this._fromInput;
+            }
+
         },
         get: function() {
             return this.__selectedIndexes;
@@ -218,7 +221,7 @@ var SelectInput = exports.SelectInput =  Montage.create(NativeControl, {
                     }
                     this._fromInput = true;
                     this.contentController.selectedIndexes = selectedIndexes;
-                    
+
                 }
             }