From cf2005d942ec7fd6dfffa96aaf74790ab7c5ee0c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 30 Dec 2015 17:04:34 +0100 Subject: Fix T47081: laplacian smooth edit mode tool crash. --- intern/eigen/intern/linear_solver.cc | 12 ++++++++++++ intern/eigen/intern/linear_solver.h | 1 + 2 files changed, 13 insertions(+) (limited to 'intern/eigen') diff --git a/intern/eigen/intern/linear_solver.cc b/intern/eigen/intern/linear_solver.cc index 181b278b9c0..0fc4d39309b 100644 --- a/intern/eigen/intern/linear_solver.cc +++ b/intern/eigen/intern/linear_solver.cc @@ -156,6 +156,14 @@ void EIG_linear_solver_variable_lock(LinearSolver *solver, int index) } } +void EIG_linear_solver_variable_unlock(LinearSolver *solver, int index) +{ + if (solver->variable[index].locked) { + assert(solver->state == LinearSolver::STATE_VARIABLES_CONSTRUCT); + solver->variable[index].locked = false; + } +} + static void linear_solver_variables_to_vector(LinearSolver *solver) { int num_rhs = solver->num_rhs; @@ -269,6 +277,10 @@ void EIG_linear_solver_right_hand_side_add(LinearSolver *solver, int rhs, int in bool EIG_linear_solver_solve(LinearSolver *solver) { + /* nothing to solve, perhaps all variables were locked */ + if (solver->m == 0 || solver->n == 0) + return true; + bool result = true; assert(solver->state != LinearSolver::STATE_VARIABLES_CONSTRUCT); diff --git a/intern/eigen/intern/linear_solver.h b/intern/eigen/intern/linear_solver.h index 2dbea4d6f68..8f07e24e9a6 100644 --- a/intern/eigen/intern/linear_solver.h +++ b/intern/eigen/intern/linear_solver.h @@ -51,6 +51,7 @@ void EIG_linear_solver_delete(LinearSolver *solver); void EIG_linear_solver_variable_set(LinearSolver *solver, int rhs, int index, double value); double EIG_linear_solver_variable_get(LinearSolver *solver, int rhs, int index); void EIG_linear_solver_variable_lock(LinearSolver *solver, int index); +void EIG_linear_solver_variable_unlock(LinearSolver *solver, int index); /* Matrix (A) and right hand side (b) */ -- cgit v1.2.3