[Bf-blender-cvs] [db7b3de9184] master: GPencil: Copy temp color in multiframe

Antonio Vazquez noreply at git.blender.org
Sat Sep 21 10:40:16 CEST 2019


Commit: db7b3de9184fcebd711c94662e80d935cad2cd3d
Author: Antonio Vazquez
Date:   Fri Sep 20 15:43:56 2019 +0200
Branches: master
https://developer.blender.org/rBdb7b3de9184fcebd711c94662e80d935cad2cd3d

GPencil: Copy temp color in multiframe

As the evaluated data is not calculated in multiframe, needs to have the original colors.

Related to T70116

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

M	source/blender/draw/engines/gpencil/gpencil_draw_utils.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 4b32f7fdc0d..4375e9fb3ad 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1180,6 +1180,12 @@ static void gpencil_draw_strokes(GpencilBatchCache *cache,
       continue;
     }
 
+    /* Copy color to temp fields. */
+    if ((is_multiedit) && (gp_style)) {
+      copy_v4_v4(gps->runtime.tmp_stroke_rgba, gp_style->stroke_rgba);
+      copy_v4_v4(gps->runtime.tmp_fill_rgba, gp_style->fill_rgba);
+    }
+
     /* be sure recalc all cache in source stroke to avoid recalculation when frame change
      * and improve fps */
     gpencil_recalc_geometry_caches(



More information about the Bf-blender-cvs mailing list