Commit: d501d0f91ecc9cc1fa832d8145683cd2a30b8640
Author: Bastien Montagne
Date: Wed Jul 6 17:12:35 2016 +0200
Branches: master
https://developer.blender.org/rBd501d0f91ecc9cc1fa832d8145683cd2a30b8640
Revert rB961ebfa8c40b9909 - do not set Main's versions directly in
do_versions().
This breaks any post-versionning (like IPO conversion, python handler, etc.).
rB961ebfa8c40b9909 mentions some Main being do_versionned several times (which
is not desired for sure),
will try to reproduce again and find another fix.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 0dd099d..68cc060 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -113,7 +113,6 @@
#include "BKE_action.h"
#include "BKE_armature.h"
-#include "BKE_blender_version.h"
#include "BKE_brush.h"
#include "BKE_cloth.h"
#include "BKE_constraint.h"
@@ -8287,9 +8286,6 @@ static void do_versions(FileData *fd, Library *lib, Main
*main)
blo_do_versions_260(fd, lib, main);
blo_do_versions_270(fd, lib, main);
- main->versionfile = BLENDER_VERSION;
- main->subversionfile = BLENDER_SUBVERSION;
-
/* WATCH IT!!!: pointers from libdata have not been converted yet here!
*/
/* WATCH IT 2!: Userdef struct init see do_versions_userdef() above! */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
