blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix specific 2.8 broken files 

Short of checking for types (SceneLayer) this is the only reliable
way of getting all 2.80 files to date.
This commit is contained in:
Dalai Felinto 2017-11-23 12:54:52 -02:00
parent 5330e7fd29
commit e314aa1e47
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/makesdna/intern/dna_genfile.c
View File

@ -325,16 +325,29 @@ static bool need_doversion_280(SDNA *sdna, int *data, const bool data_alloc)
return false;
}
bool active_layer = false, render_layers = false;
const char *cp = (char *)data;
for (int nr = 0; nr < sdna->nr_names; nr++) {
if (strcmp(cp, "*cur_render_layer") == 0) {
return true;
if (strcmp(cp, "active_layer") == 0) {
active_layer = true;
if (active_layer && render_layers) {
return true;
}
}
else if (strcmp(cp, "render_layers") == 0) {
render_layers = true;
if (active_layer && render_layers) {
return true;
}
}
while (*cp) cp++;
cp++;
}
/* If someone adds only one of them to the DNA, don't! */
BLI_assert(!(active_layer || render_layers));
return false;
}