diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/blob/3d_viewer/index.js | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/blob/3d_viewer/index.js')
-rw-r--r-- | app/assets/javascripts/blob/3d_viewer/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/blob/3d_viewer/index.js b/app/assets/javascripts/blob/3d_viewer/index.js index 94397d70384..fd064e7ca8f 100644 --- a/app/assets/javascripts/blob/3d_viewer/index.js +++ b/app/assets/javascripts/blob/3d_viewer/index.js @@ -1,6 +1,6 @@ -import * as THREE from 'three/build/three.module'; -import STLLoaderClass from 'three-stl-loader'; import OrbitControlsClass from 'three-orbit-controls'; +import STLLoaderClass from 'three-stl-loader'; +import * as THREE from 'three/build/three.module'; import MeshObject from './mesh_object'; const STLLoader = STLLoaderClass(THREE); |