[Bf-blender-cvs] [0d47a4d2feb] blender2.8: T55291: Matcaps were reset when loading file

Jeroen Bakker noreply at git.blender.org
Tue Jun 5 12:23:25 CEST 2018


Commit: 0d47a4d2feb43c686de2534b3bd0855bb315acc7
Author: Jeroen Bakker
Date:   Tue Jun 5 12:20:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0d47a4d2feb43c686de2534b3bd0855bb315acc7

T55291: Matcaps were reset when loading file

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

M	source/blender/blenloader/intern/versioning_280.c

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 7827e793049..f73df9ab844 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1537,7 +1537,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
 				}
 			}
 		}
-		if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "char", "matcap")) {
+		if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "char", "matcap[256]")) {
 			StudioLight *default_matcap = BKE_studiolight_find_first(STUDIOLIGHT_ORIENTATION_VIEWNORMAL);
 			/* when loading the internal file is loaded before the matcaps */
 			if (default_matcap) {



More information about the Bf-blender-cvs mailing list