From 15a90f63b816e87015bccc756b0e8bb57d22a5b4 Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Mon, 6 Mar 2017 15:33:22 +0100 Subject: [PATCH 1/2] fix bug in osgb/osgt/osgx readerwriter causing the osgParticle-SizeInterpolator and -ColorInterpolator to dissapear --- src/osgWrappers/serializers/osgParticle/Particle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgWrappers/serializers/osgParticle/Particle.cpp b/src/osgWrappers/serializers/osgParticle/Particle.cpp index 42493997e..3f0187b44 100644 --- a/src/osgWrappers/serializers/osgParticle/Particle.cpp +++ b/src/osgWrappers/serializers/osgParticle/Particle.cpp @@ -36,7 +36,7 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p ) if ( hasInterpolator ) { is >> is.BEGIN_BRACKET; - p.setAlphaInterpolator( is.readObjectOfType() ); + p.setSizeInterpolator( is.readObjectOfType() ); is >> is.END_BRACKET; } is >> is.PROPERTY("AlphaInterpolator") >> hasInterpolator; @@ -50,7 +50,7 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p ) if ( hasInterpolator ) { is >> is.BEGIN_BRACKET; - p.setAlphaInterpolator( is.readObjectOfType() ); + p.setColorInterpolator( is.readObjectOfType() ); is >> is.END_BRACKET; } From a2ce0a0e0f1c70b72f93f0fa8ee1291b414833e3 Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Mon, 6 Mar 2017 15:56:49 +0100 Subject: [PATCH 2/2] bugfix: read endbracket for fileversion 145 (introduced 25/8/2016) --- src/osgWrappers/serializers/osgParticle/Particle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgWrappers/serializers/osgParticle/Particle.cpp b/src/osgWrappers/serializers/osgParticle/Particle.cpp index 3f0187b44..9c70753f7 100644 --- a/src/osgWrappers/serializers/osgParticle/Particle.cpp +++ b/src/osgWrappers/serializers/osgParticle/Particle.cpp @@ -81,8 +81,8 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p ) is >> is.END_BRACKET; } - is >> is.END_BRACKET; } + is >> is.END_BRACKET; return true; }