diff options
Diffstat (limited to 'source/blender/makesdna/intern/dna_genfile.c')
-rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index c9385f98584..9c44d60b7c2 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -476,9 +476,16 @@ static bool init_structDNA( /* this is a patch, to change struct names without a conflict with SDNA */ /* be careful to use it, in this case for a system-struct (opengl/X) */ - if (*cp == 'b') { - /* struct Screen was already used by X, 'bScreen' replaces the old IrisGL 'Screen' struct */ - if (strcmp("bScreen", cp) == 0) sdna->types[nr] = cp + 1; + /* struct Screen was already used by X, 'bScreen' replaces the old IrisGL 'Screen' struct */ + if (strcmp("bScreen", cp) == 0) { + sdna->types[nr] = cp + 1; + } + /* Groups renamed to collections in 2.8 */ + else if (strcmp("Collection", cp) == 0) { + sdna->types[nr] = "Group"; + } + else if (strcmp("CollectionObject", cp) == 0) { + sdna->types[nr] = "GroupObject"; } else if (doversion_280) { if (strcmp(cp, "SceneLayer") == 0) { |