From 5722cb4861a8a272830be549b2e50e530e38ffe3 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 9 Jun 2003 18:56:59 +0000 Subject: [PATCH] go ahead and add rows with shear transforms, even though it won't be completely correct --- panda/src/egg/eggXfmSAnim.cxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/panda/src/egg/eggXfmSAnim.cxx b/panda/src/egg/eggXfmSAnim.cxx index 99833637c2..7ad6990a9f 100644 --- a/panda/src/egg/eggXfmSAnim.cxx +++ b/panda/src/egg/eggXfmSAnim.cxx @@ -482,16 +482,13 @@ set_value(int row, const LMatrix4d &mat) { // // This function may fail silently if the matrix cannot // be decomposed into scale, rotate, and translate. In -// this case, nothing is done and the function returns -// false. +// this case, the closest approximation is added to the +// table, and false is returned. //////////////////////////////////////////////////////////////////// bool EggXfmSAnim:: add_data(const LMatrix4d &mat) { LVector3d scale, hpr, translate; - bool result = decompose_matrix(mat, scale, hpr, translate, _coordsys); - if (!result) { - return false; - } + bool add_ok = decompose_matrix(mat, scale, hpr, translate, _coordsys); if (empty()) { // If we have no children, create all nine tables now. @@ -576,7 +573,8 @@ add_data(const LMatrix4d &mat) { } nassertr(num_tables == 9, false); - return true; + + return add_ok; } ////////////////////////////////////////////////////////////////////