Merge branch 'dev' into dark_mode
This commit is contained in:
commit
2f1be7efb3
@ -130,8 +130,6 @@ OV.Website = class
|
|||||||
|
|
||||||
OnModelFinished (importResult, threeMeshes)
|
OnModelFinished (importResult, threeMeshes)
|
||||||
{
|
{
|
||||||
let importedExtension = OV.GetFileExtension (importResult.mainFile);
|
|
||||||
this.eventHandler.HandleEvent ('model_loaded', { extension : importedExtension });
|
|
||||||
this.model = importResult.model;
|
this.model = importResult.model;
|
||||||
this.ShowViewer (true);
|
this.ShowViewer (true);
|
||||||
this.viewer.AddMeshes (threeMeshes);
|
this.viewer.AddMeshes (threeMeshes);
|
||||||
@ -447,6 +445,8 @@ OV.Website = class
|
|||||||
onFinish : (importResult, threeMeshes) =>
|
onFinish : (importResult, threeMeshes) =>
|
||||||
{
|
{
|
||||||
this.OnModelFinished (importResult, threeMeshes);
|
this.OnModelFinished (importResult, threeMeshes);
|
||||||
|
let importedExtension = OV.GetFileExtension (importResult.mainFile);
|
||||||
|
this.eventHandler.HandleEvent ('model_loaded', { extension : importedExtension });
|
||||||
},
|
},
|
||||||
onRender : () =>
|
onRender : () =>
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user