Fix temple arena broken rescue in graphical server
This commit is contained in:
parent
26b5d413e4
commit
d2df7c6de9
@ -2868,7 +2868,10 @@ void Track::copyFromMainProcess()
|
|||||||
{
|
{
|
||||||
TrackObject* clone = to->cloneToChild();
|
TrackObject* clone = to->cloneToChild();
|
||||||
if (clone)
|
if (clone)
|
||||||
|
{
|
||||||
m_track_object_manager->insertObject(clone);
|
m_track_object_manager->insertObject(clone);
|
||||||
|
m_track_object_manager->insertDriveableObject(clone);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_track_mesh = new TriangleMesh(/*can_be_transformed*/false);
|
m_track_mesh = new TriangleMesh(/*can_be_transformed*/false);
|
||||||
|
@ -273,6 +273,13 @@ void TrackObjectManager::insertObject(TrackObject* object)
|
|||||||
m_all_objects.push_back(object);
|
m_all_objects.push_back(object);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
void TrackObjectManager::insertDriveableObject(TrackObject* object)
|
||||||
|
{
|
||||||
|
if (object && object->isDriveable())
|
||||||
|
m_driveable_objects.push_back(object);
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
/** Removes the object from the scene graph, bullet, and the list of
|
/** Removes the object from the scene graph, bullet, and the list of
|
||||||
* track objects, and then frees the object.
|
* track objects, and then frees the object.
|
||||||
|
@ -70,7 +70,7 @@ public:
|
|||||||
bool interpolate_normal = false) const;
|
bool interpolate_normal = false) const;
|
||||||
|
|
||||||
void insertObject(TrackObject* object);
|
void insertObject(TrackObject* object);
|
||||||
|
void insertDriveableObject(TrackObject* object);
|
||||||
void removeObject(TrackObject* who);
|
void removeObject(TrackObject* who);
|
||||||
void removeDriveableObject(TrackObject* obj) { m_driveable_objects.remove(obj); }
|
void removeDriveableObject(TrackObject* obj) { m_driveable_objects.remove(obj); }
|
||||||
TrackObject* getTrackObject(const std::string& libraryInstance, const std::string& name);
|
TrackObject* getTrackObject(const std::string& libraryInstance, const std::string& name);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user