[Bf-blender-cvs] [1243aec8bc1] greasepencil-object: GPencil: Cleanup

Antonio Vazquez noreply at git.blender.org
Mon Nov 4 18:05:43 CET 2019


Commit: 1243aec8bc1411e762c3786c1cb595e21e9595a5
Author: Antonio Vazquez
Date:   Mon Nov 4 18:05:36 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB1243aec8bc1411e762c3786c1cb595e21e9595a5

GPencil: Cleanup

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

M	source/blender/editors/gpencil/gpencil_paint.c

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

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index da942267a94..eb93c92fb56 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -973,12 +973,6 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
   gps->inittime = p->inittime;
   gps->uv_scale = 1.0f;
 
-  /* Apply the mix color to fill. */
-  if (GPENCIL_USE_VERTEX_COLOR_FILL(ts)) {
-    copy_v3_v3(gps->mix_color_fill, brush->rgb);
-    gps->mix_color_fill[3] = brush->gpencil_settings->vertex_factor;
-  }
-
   /* enable recalculation flag by default */
   gps->flag |= GP_STROKE_RECALC_GEOMETRY;
 
@@ -1000,6 +994,12 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
     dvert = gps->dvert + (gps->totpoints - totelem);
   }
 
+  /* Apply the mix color to fill for stroke. */
+  if (GPENCIL_USE_VERTEX_COLOR_FILL(ts)) {
+    copy_v3_v3(gps->mix_color_fill, brush->rgb);
+    gps->mix_color_fill[3] = brush->gpencil_settings->vertex_factor;
+  }
+
   /* copy points from the buffer to the stroke */
   if (p->paintmode == GP_PAINTMODE_DRAW_STRAIGHT) {
     /* straight lines only -> only endpoints */



More information about the Bf-blender-cvs mailing list