Commit: 2883ce03118b686551eb2900d7d0c9ad8a7b2574
Author: Antonio Vazquez
Date: Sat Nov 30 11:55:51 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB2883ce03118b686551eb2900d7d0c9ad8a7b2574
GPencil: Fix versioning code after merge
===================================================================
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 f367a70b34a..ac8e78dbd07 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -4240,10 +4240,6 @@ void blo_do_versions_280(FileData *fd, Library
*UNUSED(lib), Main *bmain)
}
}
}
- }
-
- {
- /* Versioning code until next subversion bump goes here. */
/* Init new Grease Pencil Paint tools. */
{
@@ -4268,7 +4264,7 @@ void blo_do_versions_280(FileData *fd, Library
*UNUSED(lib), Main *bmain)
BKE_paint_toolslots_init_from_main(bmain);
}
- /* Init default Vertex paint mix factor for Viewport. */
+ /* Init default Grease Pencil Vertex paint mix factor for Viewport. */
{
if (!DNA_struct_elem_find(
fd->filesdna, "View3DOverlay", "float",
"gpencil_vertex_paint_opacity")) {
@@ -4285,7 +4281,7 @@ void blo_do_versions_280(FileData *fd, Library
*UNUSED(lib), Main *bmain)
}
}
- /* Init default Vertex paint layer mix factor. */
+ /* Init default Grease Pencil Vertex paint layer mix factor. */
{
if (!DNA_struct_elem_find(fd->filesdna, "bGPDlayer", "float",
"vertex_paint_opacity")) {
for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) {
@@ -4296,4 +4292,8 @@ void blo_do_versions_280(FileData *fd, Library
*UNUSED(lib), Main *bmain)
}
}
}
+
+ {
+ /* Versioning code until next subversion bump goes here. */
+ }
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
