Merge remote-tracking branch 'refs/remotes/BabylonJS/master' into ParticleAnimation

# Conflicts:
#	dist/preview release/babylon.d.ts
#	dist/preview release/babylon.js
#	dist/preview release/babylon.module.d.ts
#	dist/preview release/babylon.worker.js

dist/preview release/babylon.max.js

@@ -15597,7 +15597,7 @@ var BABYLON;
                         this._rigCameras[1].getProjectionMatrix = this._getWebVRProjectionMatrix;
                         this._rigCameras[1].parent = this;
                         this._rigCameras[1]._getViewMatrix = this._getWebVRViewMatrix;
-                        if (Camera.UseImprovedWebVRRendering) {
+                        if (Camera.UseAlternateWebVRRendering) {
                             this._rigCameras[1]._skipRendering = true;
                             this._rigCameras[0]._alternateCamera = this._rigCameras[1];
                         }
@@ -15793,7 +15793,7 @@ var BABYLON;
         Camera._RIG_MODE_VR = 20;
         Camera._RIG_MODE_WEBVR = 21;
         Camera.ForceAttachControlToAlwaysPreventDefault = false;
-        Camera.UseImprovedWebVRRendering = false;
+        Camera.UseAlternateWebVRRendering = false;
         __decorate([
             BABYLON.serializeAsVector3()
         ], Camera.prototype, "position", void 0);
@@ -22160,8 +22160,10 @@ var BABYLON;
                 this._effectiveMaterial.bindViewProjection(effect);
                 engine.setViewport(scene.activeCamera._alternateCamera.viewport);
                 this._draw(subMesh, fillMode, instancesCount, true);
-                scene._switchToAlternateCameraConfiguration(false);
                 engine.setViewport(scene.activeCamera.viewport);
+                scene._switchToAlternateCameraConfiguration(false);
+                this._effectiveMaterial.bindView(effect);
+                this._effectiveMaterial.bindViewProjection(effect);
             }
             return this;
         };

dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -15597,7 +15597,7 @@ var BABYLON;
                         this._rigCameras[1].getProjectionMatrix = this._getWebVRProjectionMatrix;
                         this._rigCameras[1].parent = this;
                         this._rigCameras[1]._getViewMatrix = this._getWebVRViewMatrix;
-                        if (Camera.UseImprovedWebVRRendering) {
+                        if (Camera.UseAlternateWebVRRendering) {
                             this._rigCameras[1]._skipRendering = true;
                             this._rigCameras[0]._alternateCamera = this._rigCameras[1];
                         }
@@ -15793,7 +15793,7 @@ var BABYLON;
         Camera._RIG_MODE_VR = 20;
         Camera._RIG_MODE_WEBVR = 21;
         Camera.ForceAttachControlToAlwaysPreventDefault = false;
-        Camera.UseImprovedWebVRRendering = false;
+        Camera.UseAlternateWebVRRendering = false;
         __decorate([
             BABYLON.serializeAsVector3()
         ], Camera.prototype, "position", void 0);
@@ -22160,8 +22160,10 @@ var BABYLON;
                 this._effectiveMaterial.bindViewProjection(effect);
                 engine.setViewport(scene.activeCamera._alternateCamera.viewport);
                 this._draw(subMesh, fillMode, instancesCount, true);
-                scene._switchToAlternateCameraConfiguration(false);
                 engine.setViewport(scene.activeCamera.viewport);
+                scene._switchToAlternateCameraConfiguration(false);
+                this._effectiveMaterial.bindView(effect);
+                this._effectiveMaterial.bindViewProjection(effect);
             }
             return this;
         };

gui/src/advancedDynamicTexture.ts

@@ -351,8 +351,8 @@ module BABYLON.GUI {
                 let camera = scene.cameraToUseForPointers || scene.activeCamera;
                 let engine = scene.getEngine();
                 let viewport = camera.viewport;
-                let x = (scene.pointerX - viewport.x * engine.getRenderWidth()) / viewport.width;
-                let y = (scene.pointerY - viewport.y * engine.getRenderHeight()) / viewport.height;
+                let x = (scene.pointerX / engine.getHardwareScalingLevel() - viewport.x * engine.getRenderWidth()) / viewport.width;
+                let y = (scene.pointerY / engine.getHardwareScalingLevel() - viewport.y * engine.getRenderHeight()) / viewport.height;
 
                 this._shouldBlockPointer = false;
                 this._doPicking(x, y, pi.type);

src/Cameras/babylon.camera.ts

@@ -63,7 +63,7 @@
 
         public static ForceAttachControlToAlwaysPreventDefault = false;
 
-        public static UseImprovedWebVRRendering = false;
+        public static UseAlternateWebVRRendering = false;
 
         // Members
         @serializeAsVector3()
@@ -740,7 +740,7 @@
                         this._rigCameras[1].parent = this;
                         this._rigCameras[1]._getViewMatrix = this._getWebVRViewMatrix;
 
-                        if (Camera.UseImprovedWebVRRendering) {
+                        if (Camera.UseAlternateWebVRRendering) {
                             this._rigCameras[1]._skipRendering = true;
                             this._rigCameras[0]._alternateCamera = this._rigCameras[1];
                         }

src/Mesh/babylon.mesh.ts

@@ -941,8 +941,11 @@
 
                 engine.setViewport(scene.activeCamera._alternateCamera.viewport);
                 this._draw(subMesh, fillMode, instancesCount, true);
-                scene._switchToAlternateCameraConfiguration(false);
                 engine.setViewport(scene.activeCamera.viewport);
+
+                scene._switchToAlternateCameraConfiguration(false);
+                this._effectiveMaterial.bindView(effect);
+                this._effectiveMaterial.bindViewProjection(effect);
             }
             return this;
         }