From 98d28a8a6c503a217a1fe9377e6219f8d512fe11 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 2 Sep 2016 11:37:25 +0200 Subject: Blender 2.78 commit! Includes: - Version bump to 2.78 - Doxy file update - New splash screen - Wrapped some do_versions with version check - Updated template to use proper font After poking around a lot it seems Droid Sans was used during 2.7x series. (or at least difference between using this font and comparing to previous splash screens gives none visible difference). --- doc/doxygen/Doxyfile | 2 +- release/datafiles/splash.png | Bin 230768 -> 283527 bytes release/datafiles/splash_2x.png | Bin 812837 -> 988186 bytes release/datafiles/splash_template.xcf | Bin 1274820 -> 1267126 bytes source/blender/blenkernel/BKE_blender_version.h | 6 +++--- source/blender/blenloader/intern/versioning_270.c | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index b34d4dfe6f1..9834cda43bc 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = Blender # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "V2.7x" +PROJECT_NUMBER = "V2.8x" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png index fa893b4be0d..60956db2576 100644 Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png differ diff --git a/release/datafiles/splash_2x.png b/release/datafiles/splash_2x.png index f8dd2bbeaf3..3a5000c6bbc 100644 Binary files a/release/datafiles/splash_2x.png and b/release/datafiles/splash_2x.png differ diff --git a/release/datafiles/splash_template.xcf b/release/datafiles/splash_template.xcf index b3141471c51..12719b5c155 100644 Binary files a/release/datafiles/splash_template.xcf and b/release/datafiles/splash_template.xcf differ diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 483fefbd89c..189340db618 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -27,8 +27,8 @@ /* these lines are grep'd, watch out for our not-so-awesome regex * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ -#define BLENDER_VERSION 277 -#define BLENDER_SUBVERSION 3 +#define BLENDER_VERSION 278 +#define BLENDER_SUBVERSION 0 /* Several breakages with 270, e.g. constraint deg vs rad */ #define BLENDER_MINVERSION 270 #define BLENDER_MINSUBVERSION 6 @@ -37,7 +37,7 @@ /* can be left blank, otherwise a,b,c... etc with no quotes */ #define BLENDER_VERSION_CHAR /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE alpha +#define BLENDER_VERSION_CYCLE rc extern char versionstr[]; /* from blender.c */ diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 0a36e7846fe..dfaa59c4e3f 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1348,7 +1348,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) /* ------- end of grease pencil initialization --------------- */ } - { + if (!MAIN_VERSION_ATLEAST(main, 278, 0)) { if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingTrack", "float", "weight_stab")) { MovieClip *clip; for (clip = main->movieclip.first; clip; clip = clip->id.next) { -- cgit v1.2.3