blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fixup for doversion (rB8d573aa0 and rBa7e74791)

This commit is contained in:
Dalai Felinto 2016-10-17 19:43:35 +00:00
parent 5e92a0faad
commit cccd3eb5a8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/versioning_270.c
View File

@ -1393,7 +1393,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
}
}
}
if (!MAIN_VERSION_ATLEAST(main, 279, 0)) {
if (!MAIN_VERSION_ATLEAST(main, 278, 2)) {
if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "ffmpeg_preset")) {
for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
/* "medium" is the preset FFmpeg uses when no presets are given. */

2
source/blender/editors/interface/resources.c
View File

@ -2742,7 +2742,7 @@ void init_userdef_do_versions(void)
}
}
if (!USER_VERSION_ATLEAST(278, 1)) {
if (!USER_VERSION_ATLEAST(278, 2)) {
bTheme *btheme;
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
rgba_char_args_set(btheme->tv3d.vertex_bevel, 0, 165, 255, 255);