[Bf-blender-cvs] [cccd3eb] master: Fixup for doversion (rB8d573aa0 and rBa7e74791)

[Dalai Felinto]

Commit: cccd3eb5a8107cd215fc5e3b8ecdf275ed5c48f2
Author: Dalai Felinto
Date:   Mon Oct 17 19:43:35 2016 +0000
Branches: master
https://developer.blender.org/rBcccd3eb5a8107cd215fc5e3b8ecdf275ed5c48f2

Fixup for doversion (rB8d573aa0 and rBa7e74791)

===================================================================

M       source/blender/blenloader/intern/versioning_270.c
M       source/blender/editors/interface/resources.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_270.c 
b/source/blender/blenloader/intern/versioning_270.c
index a2a10f5..14e02c9 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -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. */
diff --git a/source/blender/editors/interface/resources.c 
b/source/blender/editors/interface/resources.c
index 9187ab6..5e24dc9 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs