TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the curve bug for real this time. Last fix to the curve just hid it.

Browse Source 
https://bugs.launchpad.net/panda3d/+bug/383969

Happy curving without segfaults!
This commit is contained in:
treeform 2010-01-12 08:19:15 +00:00
parent ca2ec74da7
commit fa700bd7c3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/parametrics/parametricCurveCollection.cxx
View File

@ -518,10 +518,6 @@ evaluate(float t, LVecBase3f &xyz, LVecBase3f &hpr) const {
} }
} }
if (default_curve == (ParametricCurve *)NULL) {
return false;
}
if (xyz_curve == (ParametricCurve *)NULL) { if (xyz_curve == (ParametricCurve *)NULL) {
xyz_curve = default_curve; xyz_curve = default_curve;
} }

4
panda/src/parametrics/piecewiseCurve.cxx
View File

@ -82,7 +82,9 @@ bool PiecewiseCurve::
get_point(float t, LVecBase3f &point) const { get_point(float t, LVecBase3f &point) const {
const ParametricCurve *curve; const ParametricCurve *curve;
bool result = find_curve(curve, t); bool result = find_curve(curve, t);
if (curve == NULL){
return false;
}
// We use | instead of || so we won't short-circuit this calculation. // We use | instead of || so we won't short-circuit this calculation.
return result | curve->get_point(t, point); return result | curve->get_point(t, point);
} }