[Bf-blender-cvs] [1cf5cc790e5] greasepencil-object: GPencil: Fix wrong versioning default struct name

Antonio Vazquez noreply at git.blender.org
Sat Nov 23 12:14:20 CET 2019


Commit: 1cf5cc790e5bf22a3a83c5f257d20c98f400eaa4
Author: Antonio Vazquez
Date:   Sat Nov 23 12:14:16 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB1cf5cc790e5bf22a3a83c5f257d20c98f400eaa4

GPencil: Fix wrong versioning default struct name

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

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 948a6e69335..27dc0120013 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1549,7 +1549,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
   if (!MAIN_VERSION_ATLEAST(bmain, 280, 3)) {
     /* init grease pencil grids and paper */
     if (!DNA_struct_elem_find(
-            fd->filesdna, "gp_paper_opacity", "float", "gpencil_paper_color[3]")) {
+            fd->filesdna, "View3DOverlay", "float", "gpencil_paper_color[3]")) {
       for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
         for (ScrArea *area = screen->areabase.first; area; area = area->next) {
           for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
@@ -3982,7 +3982,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
     /* Init default Vertex paint mix factor for Viewport. */
     {
       if (!DNA_struct_elem_find(fd->filesdna,
-                                "gpencil_vertex_paint_opacity",
+                                "View3DOverlay",
                                 "float",
                                 "gpencil_vertex_paint_opacity")) {
         for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {



More information about the Bf-blender-cvs mailing list