Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2019-09-20 16:43:56 +0300
committerAntonio Vazquez <blendergit@gmail.com>2019-09-21 11:29:25 +0300
commitdb7b3de9184fcebd711c94662e80d935cad2cd3d (patch)
treeb38044c87872b44a5ced4f1c614130dccda6b8c4 /source/blender/draw/engines/gpencil/gpencil_draw_utils.c
parentbf4fa5792dcda8ecf596f5e3a89bffb002e5d605 (diff)
GPencil: Copy temp color in multiframe
As the evaluated data is not calculated in multiframe, needs to have the original colors. Related to T70116
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_draw_utils.c')
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_draw_utils.c6
1 files changed, 6 insertions, 0 deletions
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(