[Bf-blender-cvs] [25872ca] master: Fix error in GPencil V2 version patching

Julian Eisel noreply at git.blender.org
Sat Aug 13 01:35:41 CEST 2016


Commit: 25872cae291235ec49298419a2fa141a1c98cbb9
Author: Julian Eisel
Date:   Sat Aug 13 01:29:17 2016 +0200
Branches: master
https://developer.blender.org/rB25872cae291235ec49298419a2fa141a1c98cbb9

Fix error in GPencil V2 version patching

GPencil conversion would just always run for file version 2.77.3. This wasn't an issue in master, but possibly for other branches that used the 2.77.3 block.

Wasn't aware that you have to add the asterisk for pointers either, this is kinda weird. Anyway, it's running correctly now.

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

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 af95649..f41aba1 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1246,7 +1246,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 	if (!MAIN_VERSION_ATLEAST(main, 277, 3)) {
 		/* ------- init of grease pencil initialization --------------- */
-		if (!DNA_struct_elem_find(fd->filesdna, "bGPDstroke", "bGPDpalettecolor", "palcolor")) {
+		if (!DNA_struct_elem_find(fd->filesdna, "bGPDstroke", "bGPDpalettecolor", "*palcolor")) {
 			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
 				ToolSettings *ts = scene->toolsettings;
 				/* initialize use position for sculpt brushes */




More information about the Bf-blender-cvs mailing list