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