From eae23b01c3939627f78659fbaa30e2427d606598 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 30 Jan 2009 14:54:22 +0000 Subject: [PATCH] From Lionel Lagarde, "this correct how the ParticleEffect are serialized : - the texture file name is taken from the TextFileName field - the texture file name is written using writeString " --- src/osgPlugins/osgParticle/IO_ParticleEffect.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/osgPlugins/osgParticle/IO_ParticleEffect.cpp b/src/osgPlugins/osgParticle/IO_ParticleEffect.cpp index b5f61b12f..82f9656ec 100644 --- a/src/osgPlugins/osgParticle/IO_ParticleEffect.cpp +++ b/src/osgPlugins/osgParticle/IO_ParticleEffect.cpp @@ -23,8 +23,8 @@ bool ParticleEffect_readLocalData(osg::Object& object, osgDB::Input& fr) { osgParticle::ParticleEffect& effect = static_cast(object); bool itrAdvanced = false; - - if (fr.matchSequence("position %s")) + + if (fr.matchSequence("textFileName %s")) { effect.setTextureFileName(fr[1].getStr()); fr += 2; @@ -192,8 +192,7 @@ bool ParticleEffect_readLocalData(osg::Object& object, osgDB::Input& fr) bool ParticleEffect_writeLocalData(const osg::Object& object, osgDB::Output& fw) { const osgParticle::ParticleEffect& effect = static_cast(object); - - fw.indent()<<"textFileName "<