Skip to content

Commit 304d8ab

Browse files
committed
Fix bug where mesh warp tries to initialize too early
1 parent 42f8a31 commit 304d8ab

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Studio/Analysis/AnalysisTool.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1679,7 +1679,9 @@ void AnalysisTool::on_metrics_open_button_toggled() {
16791679
//---------------------------------------------------------------------------
16801680
void AnalysisTool::initialize_mesh_warper() {
16811681
if (session_->particles_present() && session_->get_groomed_present()) {
1682-
compute_stats();
1682+
if (!compute_stats()) {
1683+
return;
1684+
}
16831685

16841686
auto params = session_->get_project()->get_parameters(Parameters::ANALYSIS_PARAMS);
16851687

Studio/Interface/ShapeWorksStudioApp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1528,7 +1528,6 @@ void ShapeWorksStudioApp::open_project(QString filename) {
15281528
}
15291529

15301530
analysis_tool_->reset_stats();
1531-
analysis_tool_->initialize_mesh_warper();
15321531

15331532
block_update_ = true;
15341533

@@ -1565,6 +1564,7 @@ void ShapeWorksStudioApp::open_project(QString filename) {
15651564
on_zoom_slider_valueChanged();
15661565

15671566
session_->set_loading(false);
1567+
analysis_tool_->initialize_mesh_warper();
15681568

15691569
if (ui_->action_analysis_mode->isChecked() && !ui_->action_analysis_mode->isEnabled()) {
15701570
on_action_import_mode_triggered();

0 commit comments

Comments
 (0)