diff --git a/BlendFile/DNA/ActionLayer.cs b/BlendFile/DNA/ActionLayer.cs index db533f9..49dc7ea 100644 --- a/BlendFile/DNA/ActionLayer.cs +++ b/BlendFile/DNA/ActionLayer.cs @@ -25,7 +25,7 @@ namespace BlendFile.DNA { public sbyte layer_mix_mode; [DNAFieldAttribute(2, "uchar", 4, "_pad0[2]", "System.Byte[]", false, 70)] public byte[] _pad0 = new System.Byte[2]; - [DNAListAttribute(8, "ActionStrip", "**strip_array", 5, "ActionStrip", 80, "strip_array_num", 6, 72, 0)] + [DNAListAttribute(8, "ActionStrip", "**strip_array", 5, "ActionStrip", "int", "strip_array_num", 6, 72, 80)] public System.Collections.Generic.List strip_array; [DNAFieldAttribute(4, "uchar", 7, "_pad1[4]", "System.Byte[]", false, 84)] public byte[] _pad1 = new System.Byte[4]; diff --git a/BlendFile/DNA/ActionStripKeyframeData.cs b/BlendFile/DNA/ActionStripKeyframeData.cs index 14cd8a8..04abcb7 100644 --- a/BlendFile/DNA/ActionStripKeyframeData.cs +++ b/BlendFile/DNA/ActionStripKeyframeData.cs @@ -15,7 +15,7 @@ namespace BlendFile.DNA { [DNAClassAttribute(68, "ActionStripKeyframeData", 16)] public class ActionStripKeyframeData { - [DNAListAttribute(8, "ActionChannelBag", "**channelbag_array", 0, "ActionChannelBag", 8, "channelbag_array_num", 1, 0, 0)] + [DNAListAttribute(8, "ActionChannelBag", "**channelbag_array", 0, "ActionChannelBag", "int", "channelbag_array_num", 1, 0, 8)] public System.Collections.Generic.List channelbag_array; [DNAFieldAttribute(4, "uchar", 2, "_pad[4]", "System.Byte[]", false, 12)] public byte[] _pad = new System.Byte[4]; diff --git a/BlendFile/DNA/GreasePencil.cs b/BlendFile/DNA/GreasePencil.cs index bdd6cc8..9c88b81 100644 --- a/BlendFile/DNA/GreasePencil.cs +++ b/BlendFile/DNA/GreasePencil.cs @@ -19,7 +19,7 @@ namespace BlendFile.DNA { public ID id; [DNAFieldAttribute(8, "AnimData", 1, "*adt", "AnimData", true, 208)] public AnimData adt; - [DNAListAttribute(8, "GreasePencilDrawingBase", "**drawing_array", 2, "GreasePencilDrawingBase", 224, "drawing_array_size", 3, 216, 0)] + [DNAListAttribute(8, "GreasePencilDrawingBase", "**drawing_array", 2, "GreasePencilDrawingBase", "int", "drawing_array_size", 3, 216, 224)] public System.Collections.Generic.List drawing_array; [DNAFieldAttribute(4, "char", 4, "_pad[4]", "System.Char[]", false, 228)] public char[] _pad = new System.Char[4]; @@ -33,7 +33,7 @@ namespace BlendFile.DNA { public char[] _pad2 = new System.Char[4]; [DNAFieldAttribute(8, "GreasePencilLayerTreeNode", 9, "*active_node", "GreasePencilLayerTreeNode", true, 496)] public GreasePencilLayerTreeNode active_node; - [DNAListAttribute(8, "Material", "**material_array", 10, "Material", 512, "material_array_size", 11, 504, 0)] + [DNAListAttribute(8, "Material", "**material_array", 10, "Material", "short", "material_array_size", 11, 504, 512)] public System.Collections.Generic.List material_array; [DNAFieldAttribute(2, "char", 12, "_pad3[2]", "System.Char[]", false, 514)] public char[] _pad3 = new System.Char[2]; diff --git a/BlendFile/DNA/IDPropertyUIDataBool.cs b/BlendFile/DNA/IDPropertyUIDataBool.cs index cff856a..d1f7650 100644 --- a/BlendFile/DNA/IDPropertyUIDataBool.cs +++ b/BlendFile/DNA/IDPropertyUIDataBool.cs @@ -17,7 +17,7 @@ namespace BlendFile.DNA { public class IDPropertyUIDataBool { [DNAFieldAttribute(16, "IDPropertyUIData", 0, "base", "IDPropertyUIData", false, 0)] public IDPropertyUIData @base; - [DNAListAttribute(8, "int8_t", "*default_array", 1, "int8_t", 24, "default_array_len", 2, 16, 0)] + [DNAListAttribute(8, "int8_t", "*default_array", 1, "int8_t", "int", "default_array_len", 2, 16, 24)] public System.Collections.Generic.List default_array; [DNAFieldAttribute(3, "char", 3, "_pad[3]", "System.Char[]", false, 28)] public char[] _pad = new System.Char[3]; diff --git a/BlendFile/DNA/IDPropertyUIDataFloat.cs b/BlendFile/DNA/IDPropertyUIDataFloat.cs index c20c1a5..845dcae 100644 --- a/BlendFile/DNA/IDPropertyUIDataFloat.cs +++ b/BlendFile/DNA/IDPropertyUIDataFloat.cs @@ -17,7 +17,7 @@ namespace BlendFile.DNA { public class IDPropertyUIDataFloat { [DNAFieldAttribute(16, "IDPropertyUIData", 0, "base", "IDPropertyUIData", false, 0)] public IDPropertyUIData @base; - [DNAListAttribute(8, "double", "*default_array", 1, "double", 24, "default_array_len", 2, 16, 0)] + [DNAListAttribute(8, "double", "*default_array", 1, "double", "int", "default_array_len", 2, 16, 24)] public System.Collections.Generic.List default_array; [DNAFieldAttribute(4, "char", 3, "_pad[4]", "System.Char[]", false, 28)] public char[] _pad = new System.Char[4]; diff --git a/BlendFile/DNA/IDPropertyUIDataInt.cs b/BlendFile/DNA/IDPropertyUIDataInt.cs index 4fb279d..ed7917e 100644 --- a/BlendFile/DNA/IDPropertyUIDataInt.cs +++ b/BlendFile/DNA/IDPropertyUIDataInt.cs @@ -17,7 +17,7 @@ namespace BlendFile.DNA { public class IDPropertyUIDataInt { [DNAFieldAttribute(16, "IDPropertyUIData", 0, "base", "IDPropertyUIData", false, 0)] public IDPropertyUIData @base; - [DNAListAttribute(8, "int", "*default_array", 1, "int", 24, "default_array_len", 2, 16, 0)] + [DNAListAttribute(8, "int", "*default_array", 1, "int", "int", "default_array_len", 2, 16, 24)] public System.Collections.Generic.List default_array; [DNAFieldAttribute(4, "int", 3, "min", "int", false, 28)] public int min; diff --git a/BlendFile/DNA/bAction.cs b/BlendFile/DNA/bAction.cs index 2057971..7916cae 100644 --- a/BlendFile/DNA/bAction.cs +++ b/BlendFile/DNA/bAction.cs @@ -17,15 +17,15 @@ namespace BlendFile.DNA { public class bAction { [DNAFieldAttribute(208, "ID", 0, "id", "ID", false, 0)] public ID id; - [DNAListAttribute(8, "ActionLayer", "**layer_array", 1, "ActionLayer", 216, "layer_array_num", 2, 208, 0)] + [DNAListAttribute(8, "ActionLayer", "**layer_array", 1, "ActionLayer", "int", "layer_array_num", 2, 208, 216)] public System.Collections.Generic.List layer_array; [DNAFieldAttribute(4, "int", 3, "layer_active_index", "int", false, 220)] public int layer_active_index; - [DNAListAttribute(8, "ActionSlot", "**slot_array", 4, "ActionSlot", 232, "slot_array_num", 5, 224, 0)] + [DNAListAttribute(8, "ActionSlot", "**slot_array", 4, "ActionSlot", "int", "slot_array_num", 5, 224, 232)] public System.Collections.Generic.List slot_array; [DNAFieldAttribute(4, "int", 6, "last_slot_handle", "int", false, 236)] public int last_slot_handle; - [DNAListAttribute(8, "ActionStripKeyframeData", "**strip_keyframe_data_array", 7, "ActionStripKeyframeData", 248, "strip_keyframe_data_array_num", 8, 240, 0)] + [DNAListAttribute(8, "ActionStripKeyframeData", "**strip_keyframe_data_array", 7, "ActionStripKeyframeData", "int", "strip_keyframe_data_array_num", 8, 240, 248)] public System.Collections.Generic.List strip_keyframe_data_array; [DNAFieldAttribute(4, "char", 9, "_pad0[4]", "System.Char[]", false, 252)] public char[] _pad0 = new System.Char[4]; diff --git a/BlendFile/DNA/bArmature.cs b/BlendFile/DNA/bArmature.cs index 166d1dd..8246e22 100644 --- a/BlendFile/DNA/bArmature.cs +++ b/BlendFile/DNA/bArmature.cs @@ -45,7 +45,7 @@ namespace BlendFile.DNA { public short pathflag; [DNAFieldAttribute(16, "ListBase", 14, "collections", "ListBase", false, 288)] public ListBase collections; - [DNAListAttribute(8, "BoneCollection", "**collection_array", 15, "BoneCollection", 312, "collection_array_num", 16, 304, 0)] + [DNAListAttribute(8, "BoneCollection", "**collection_array", 15, "BoneCollection", "int", "collection_array_num", 16, 304, 312)] public System.Collections.Generic.List collection_array; [DNAFieldAttribute(4, "int", 17, "collection_root_count", "int", false, 316)] public int collection_root_count; diff --git a/CodeGenerator/Program.cs b/CodeGenerator/Program.cs index 3ef1a33..c55edc7 100644 --- a/CodeGenerator/Program.cs +++ b/CodeGenerator/Program.cs @@ -222,7 +222,7 @@ namespace CodeGenerator { var x = ctd.Members.OfType().FirstOrDefault(member => member.Name.ParseFName() == listPointerName); if (x != null) //Update the existing list attribute - x.CustomAttributes[0].Arguments[5] = new(new CodePrimitiveExpression(totalSize)); + x.CustomAttributes[0].Arguments[9] = new(new CodePrimitiveExpression(totalSize)); else //Store the data for when the list attribute is made listCountOffsets.Add(fName, totalSize);