[Bf-blender-cvs] [330c0d8f4a3] greasepencil-object: GPencil: Add missing flag after merge

Antonio Vazquez noreply at git.blender.org
Thu Feb 6 11:33:12 CET 2020


Commit: 330c0d8f4a3a5150a2fee7c0bb5f78b1802c03d4
Author: Antonio Vazquez
Date:   Thu Feb 6 11:32:56 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB330c0d8f4a3a5150a2fee7c0bb5f78b1802c03d4

GPencil: Add missing flag after merge

The vertex paint mode was not in master.

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 7682a4fbf9d..e1f5a791784 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6975,6 +6975,7 @@ static void direct_link_gpencil(FileData *fd, bGPdata *gpd)
     gpd->flag &= ~GP_DATA_STROKE_EDITMODE;
     gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE;
     gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
+    gpd->flag &= ~GP_DATA_STROKE_VERTEXMODE;
   }
 
   /* init stroke buffer */



More information about the Bf-blender-cvs mailing list