[Bf-blender-cvs] [fbd2517] master: Amend to previous 'append warning' commit.
Bastien Montagne
noreply at git.blender.org
Fri Dec 12 12:39:22 CET 2014
Commit: fbd25174d1275ddc22a43b4efb437ad23999babe
Author: Bastien Montagne
Date: Fri Dec 12 12:36:36 2014 +0100
Branches: master
https://developer.blender.org/rBfbd25174d1275ddc22a43b4efb437ad23999babe
Amend to previous 'append warning' commit.
Actually, append/link *is* converted/updated, issue here is IPO-to-FCurves
code is not called from our do_version code, but later, directly from BKE_blender's
setup_app_data. This is bad but not easily fixed it seems, so for now
keep a warning in this case.
thanks Sergey for the headup.
===================================================================
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 923a71c..6324771 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2643,12 +2643,10 @@ static int wm_link_append_exec(bContext *C, wmOperator *op)
lib = mainl->curlib;
BLI_assert(lib);
- if (mainl->versionfile < BLENDER_VERSION ||
- (mainl->versionfile == BLENDER_VERSION && mainl->subversionfile < BLENDER_SUBVERSION))
- {
+ if (mainl->versionfile < 250) {
BKE_reportf(op->reports, RPT_WARNING,
- "Linking or appending from an older .blend file format (%d.%d), no conversion will be done! "
- "You may want to re-save your lib file with current Blender",
+ "Linking or appending from a very old .blend file format (%d.%d), no animation conversion will "
+ "be done! You may want to re-save your lib file with current Blender",
mainl->versionfile, mainl->subversionfile);
}
More information about the Bf-blender-cvs
mailing list