FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Brede Johansen, "Changed ">" to ">=" when testing for version 16.1 or later."

Browse Source
This commit is contained in:
Robert Osfield 2006-07-05 20:56:37 +00:00
parent 0f209a5362
commit 5622e0d202
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgPlugins/OpenFlight/PaletteRecords.cpp
View File

@ -636,8 +636,8 @@ protected:
// Using parent's shader pool -- ignore this record.
return;
int32 index = in.readInt32();
int32 type = in.readInt32();
int32 index = in.readInt32(-1);
int32 type = in.readInt32(-1);
std::string name = in.readString(1024);
if (type == CG)
@ -650,13 +650,12 @@ protected:
std::string vertexProgramEntry = in.readString(256);
std::string fragmentProgramEntry = in.readString(256);
}
if (type == GLSL)
else if (type == GLSL)
{
int32 vertexProgramFileCount(1);
int32 fragmentProgramFileCount(1);
if (document.version() > VERSION_16_1)
if (document.version() >= VERSION_16_1)
{
// In 16.1, possibly multiple filenames for each vertex and fragment program.
vertexProgramFileCount = in.readInt32();