History

Merge pull request #1817 from ZappoMan/more_scripting_work

More scripting work

AndrewMeadows committed 12 years ago

Commit 867b66e2 parents b99a5fd 289be047 files · +55 −42Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 7 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+21−0
@@ -260,6 +260,27 @@ void ScriptEngine::run() { · 259 unmodified lines
260260 }
261261 }
262262 emit scriptEnding();
263+
264+ if (_voxelsScriptingInterface.getVoxelPacketSender()->serversExist()) {
265+ // release the queue of edit voxel messages.
266+ _voxelsScriptingInterface.getVoxelPacketSender()->releaseQueuedMessages();
267+
268+ // since we're in non-threaded mode, call process so that the packets are sent
269+ if (!_voxelsScriptingInterface.getVoxelPacketSender()->isThreaded()) {
270+ _voxelsScriptingInterface.getVoxelPacketSender()->process();
271+ }
272+ }
273+
274+ if (_particlesScriptingInterface.getParticlePacketSender()->serversExist()) {
275+ // release the queue of edit voxel messages.
276+ _particlesScriptingInterface.getParticlePacketSender()->releaseQueuedMessages();
277+
278+ // since we're in non-threaded mode, call process so that the packets are sent
279+ if (!_particlesScriptingInterface.getParticlePacketSender()->isThreaded()) {
280+ _particlesScriptingInterface.getParticlePacketSender()->process();
281+ }
282+ }
283+
263284 cleanMenuItems();
264285
265286 // If we were on a thread, then wait till it's done