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

From Pjotr Svetachov, "In a submission on June 27th a lot of new array types were added. This modified the osg::Array::Type enum. Because of this s_ArrayNames array in Array.cpp is now not in sync. This can lead to corrupt exports or crashes when writing .osg files because the change added new types in the middle of the enum instead of at the end.

Browse Source 
Attached is a new Array.cpp to reflect the new array types."
This commit is contained in:
Robert Osfield
2013-07-01 16:15:25 +00:00
parent 50f3b4a539
commit 0abbef71e1
1 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/osg/Array.cpp
View File

@@ -16,33 +16,52 @@ using namespace osg;
static const char* s_ArrayNames[] =
{
"Array", // 0
"ByteArray", // 1
"ShortArray", // 2
"IntArray", // 3
"Array", // 0
"ByteArray", // 1
"ShortArray", // 2
"IntArray", // 3
"UByteArray", // 4
"UShortArray", // 5
"UIntArray", // 6
"Vec4ubArray", // 7
"UByteArray", // 4
"UShortArray", // 5
"UIntArray", // 6
"FloatArray", // 8
"Vec2Array", // 9
"Vec3Array", // 10
"Vec4Array", // 11
"FloatArray", // 7
"DoubleArray", // 8
"Vec2sArray", // 12
"Vec3sArray", // 13
"Vec4sArray", // 14
"Vec2bArray", // 9
"Vec3bArray", //10
"Vec4bArray", //11
"Vec2bArray", // 15
"Vec3bArray", // 16
"Vec4bArray", // 17
"Vec2sArray", //12
"Vec3sArray", //13
"Vec4sArray", //14
"DoubleArray", // 18
"Vec2dArray", // 19
"Vec3dArray", // 20
"Vec4dArray", // 21
"Vec2iArray", //15
"Vec3iArray", //16
"Vec4iArray", //17
"Vec2ubArray", //18
"Vec3ubArray", //19
"Vec4ubArray", //20
"Vec2usArray", //21
"Vec3usArray", //22
"Vec4usArray", //23
"Vec2uiArray", //24
"Vec3uiArray", //25
"Vec4uiArray", //26
"Vec2Array", //27
"Vec3Array", //28
"Vec4Array", //29
"Vec2dArray", //30
"Vec3dArray", //31
"Vec4dArray", //32
"MatrixArray", //33
"MatrixdArray", //34
};
const char* Array::className() const