[Bf-blender-cvs] [77153b3] master: Freestyle: Fix for versioning code not working properly with new texture options.
Tamito Kajiyama
noreply at git.blender.org
Thu May 22 09:04:45 CEST 2014
Commit: 77153b303264a6ab53f8a787d95ae45594b21d24
Author: Tamito Kajiyama
Date: Thu May 22 15:00:38 2014 +0900
https://developer.blender.org/rB77153b303264a6ab53f8a787d95ae45594b21d24
Freestyle: Fix for versioning code not working properly with new texture options.
To get the versioning code properly work, the condition should have been:
DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "MTex", "*mtex[18]")
The present commit uses another new structure member instead, to avoid referring
to the magic number 18 in the last string literal.
===================================================================
M source/blender/blenloader/intern/versioning_270.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 4ca0470..7e058ae 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -280,7 +280,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
}
}
- if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "MTex", "mtex")) {
+ if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "float", "texstep")) {
FreestyleLineStyle *linestyle;
for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
More information about the Bf-blender-cvs
mailing list