[Bf-blender-cvs] [969bb04703f] greasepencil-object: GPencil: Fix errors after merge

[Antonio Vazquez]

Commit: 969bb04703fa95576d217350929564d46f1757a1
Author: Antonio Vazquez
Date:   Tue Dec 10 20:01:44 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB969bb04703fa95576d217350929564d46f1757a1

GPencil: Fix errors after merge

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

M	source/blender/blenkernel/intern/paint.c

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

diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 9b5862105de..7910dab1bba 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -918,9 +918,9 @@ bool BKE_paint_ensure(ToolSettings *ts, struct Paint **r_paint)
       BLI_assert(ELEM(*r_paint,
                       /* Cast is annoying, but prevent NULL-pointer access. */
                       (Paint *)ts->gp_paint,
-                      (Paint *)ts->gp_vertexpaint->paint,
-                      (Paint *)ts->gp_sculptpaint->paint,
-                      (Paint *)ts->gp_weightpaint->paint,
+                      (Paint *)ts->gp_vertexpaint,
+                      (Paint *)ts->gp_sculptpaint,
+                      (Paint *)ts->gp_weightpaint,
                       (Paint *)ts->sculpt,
                       (Paint *)ts->vpaint,
                       (Paint *)ts->wpaint,