spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug that made a solar system object invalid when Modify was used to 

override properties of an object with a multiphase Timeline.
sensor-dev
Chris Laurel 2010-05-17 16:56:04 +00:00
parent 1960b7c888
commit dcf48155a8
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/celengine/solarsys.cpp
View File

@ -599,8 +599,21 @@ static bool CreateTimeline(Body* body,
Orbit* newOrbit = CreateOrbit(orbitFrame->getCenter(), planetData, path, !orbitsPlanet);
if (newOrbit == NULL && orbit == NULL)
{
clog << "No valid orbit specified for object '" << body->getName() << "'. Skipping.\n";
return false;
if (body->getTimeline() && disposition == ModifyObject)
{
// The object definition is modifying an existing object with a multiple phase
// timeline, but no orbit definition was given. This can happen for completely
// sensible reasons, such a Modify definition that just changes visual properties.
// Or, the definition may try to change other timeline phase properties such as
// the orbit frame, but without providing an orbit. In both cases, we'll just
// leave the original timeline alone.
return true;
}
else
{
clog << "No valid orbit specified for object '" << body->getName() << "'. Skipping.\n";
return false;
}
}
// If a new orbit was given, override any old orbit