Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

dist/preview release/inspector/babylon.inspector.d.ts

@@ -930,7 +930,7 @@ declare module INSPECTOR {
         private _obj;
         constructor(obj: IToolVisible);
         protected action(): void;
-        private _check();
+        private _check(dontEnable?);
     }
 }
 

dist/preview release/inspector/babylon.inspector.js

@@ -3416,7 +3416,7 @@ var INSPECTOR;
             this._obj = obj;
             this._elem.classList.add('fa-eye');
             this._on = this._obj.isVisible();
-            this._check();
+            this._check(true);
         }
         // For a checkbox, set visible/invisible the corresponding prim
         Checkbox.prototype.action = function () {
@@ -3424,7 +3424,7 @@ var INSPECTOR;
             // update object and gui according to the new status
             this._check();
         };
-        Checkbox.prototype._check = function () {
+        Checkbox.prototype._check = function (dontEnable) {
             if (this._on) {
                 // set icon eye
                 this._elem.classList.add('fa-eye');
@@ -3437,7 +3437,9 @@ var INSPECTOR;
                 this._elem.classList.remove('active');
                 this._elem.classList.add('fa-eye-slash');
             }
-            this._obj.setVisible(this._on);
+            if (!dontEnable) {
+                this._obj.setVisible(this._on);
+            }
         };
         return Checkbox;
     }(INSPECTOR.AbstractTreeTool));

inspector/src/treetools/Checkbox.ts

@@ -19,7 +19,7 @@ module INSPECTOR{
             this._obj = obj;
             this._elem.classList.add('fa-eye');
             this._on = this._obj.isVisible();
-            this._check();
+            this._check(true);
         }
 
         // For a checkbox, set visible/invisible the corresponding prim
@@ -29,7 +29,7 @@ module INSPECTOR{
             this._check();
         }
 
-        private _check() {
+        private _check(dontEnable?:boolean) {
              if (this._on) {
                 // set icon eye
                 this._elem.classList.add('fa-eye');
@@ -41,7 +41,9 @@ module INSPECTOR{
                 this._elem.classList.remove('active');
                 this._elem.classList.add('fa-eye-slash');
             }
-            this._obj.setVisible(this._on);
+            if (!dontEnable) {
+                this._obj.setVisible(this._on);
+            }
         }
     }
 }