- // extract the walk mesh if necessary
- Scene *wscn;
- if(walkmesh_regexp && (wscn = newscn->extract_nodes(walkmesh_regexp))) {
- // apply all transformations to the meshes
- wscn->apply_xform();
+ Scene *newscn = mscn->sceneman->get(fname);
+ /* NOTE: setting all these after get() is not a race condition, because
+ * scene_loaded() which uses this, will only run in our main loop during
+ * SceneSet::update() on the main thread.
+ */
+ newscn->datamap = mscn->datamap;
+ mscn->datamap.clear();