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

azure-pipelines.yml

@@ -174,52 +174,52 @@ jobs:
       testRunner: JUnit
       testResultsFiles: '.temp/testResults/ModuleTestsWebpack.xml'
 
-- job: ViewerBuild
-  displayName: '8. Viewer Build'
-  pool:
-    vmImage: 'Ubuntu-16.04'
-    demands: npm
-  steps:
-  - task: Npm@1
-    displayName: 'npm install'
-    inputs:
-      workingDir: Tools/Gulp
-      verbose: false
-  - script: 'gulp typescript-viewer-libraries --max-old-space-size=8192'
-    workingDirectory: Tools/Gulp
-    displayName: 'Typescript all'
+# - job: ViewerBuild
+#   displayName: '8. Viewer Build'
+#   pool:
+#     vmImage: 'Ubuntu-16.04'
+#     demands: npm
+#   steps:
+#   - task: Npm@1
+#     displayName: 'npm install'
+#     inputs:
+#       workingDir: Tools/Gulp
+#       verbose: false
+#   - script: 'gulp typescript-viewer-libraries --max-old-space-size=8192'
+#     workingDirectory: Tools/Gulp
+#     displayName: 'Typescript all'
 
-- job: ViewerTests
-  displayName: '9. Viewer Tests'
-  pool:
-    vmImage: 'Ubuntu-16.04'
-    demands: npm
-  steps:
-  - task: Npm@1
-    displayName: 'npm install'
-    inputs:
-      workingDir: Tools/Gulp
-      verbose: false
-  - script: 'gulp typescript-viewer-libraries --max-old-space-size=8192'
-    workingDirectory: Tools/Gulp
-    displayName: 'Typescript all'
-  - script: 'gulp tests-viewer-unit --max-old-space-size=8192'
-    workingDirectory: Tools/Gulp
-    displayName: 'Unit Tests'
-  - task: PublishTestResults@2
-    condition: succeededOrFailed()
-    inputs:
-      testRunner: JUnit
-      testResultsFiles: '.temp/testResults/ViewerUnitTests.xml'
-  - script: |
-      export DISPLAY=:99
-      Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-      sleep 3 # give xvfb some time to start
-      gulp tests-viewer-validation-virtualscreen --max-old-space-size=8192
-    workingDirectory: Tools/Gulp
-    displayName: 'Visual Tests'
-  - task: PublishTestResults@2
-    condition: succeededOrFailed()
-    inputs:
-      testRunner: JUnit
-      testResultsFiles: '.temp/testResults/ViewerValidationTests.xml'
+# - job: ViewerTests
+#   displayName: '9. Viewer Tests'
+#   pool:
+#     vmImage: 'Ubuntu-16.04'
+#     demands: npm
+#   steps:
+#   - task: Npm@1
+#     displayName: 'npm install'
+#     inputs:
+#       workingDir: Tools/Gulp
+#       verbose: false
+#   - script: 'gulp typescript-viewer-libraries --max-old-space-size=8192'
+#     workingDirectory: Tools/Gulp
+#     displayName: 'Typescript all'
+#   - script: 'gulp tests-viewer-unit --max-old-space-size=8192'
+#     workingDirectory: Tools/Gulp
+#     displayName: 'Unit Tests'
+#   - task: PublishTestResults@2
+#     condition: succeededOrFailed()
+#     inputs:
+#       testRunner: JUnit
+#       testResultsFiles: '.temp/testResults/ViewerUnitTests.xml'
+#   - script: |
+#       export DISPLAY=:99
+#       Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+#       sleep 3 # give xvfb some time to start
+#       gulp tests-viewer-validation-virtualscreen --max-old-space-size=8192
+#     workingDirectory: Tools/Gulp
+#     displayName: 'Visual Tests'
+#   - task: PublishTestResults@2
+#     condition: succeededOrFailed()
+#     inputs:
+#       testRunner: JUnit
+#       testResultsFiles: '.temp/testResults/ViewerValidationTests.xml'

src/Particles/particleSystem.ts

@@ -2090,7 +2090,7 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
                 ctx.drawImage((<unknown>this.particleTexture as DynamicTexture).getContext().canvas, 0, 0);
                 (<unknown>result.particleTexture as DynamicTexture).update();
             } else {
-                result.particleTexture = new Texture(this.particleTexture.url, this._scene);
+                result.particleTexture = new Texture(this.particleTexture.url || this.particleTexture.name, this._scene);
             }
         }