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:
authorJoseph Eagar <joeedh@gmail.com>2021-09-18 06:13:39 +0300
committerJoseph Eagar <joeedh@gmail.com>2021-09-18 06:13:39 +0300
commitf0c35d16f39d837c7bceb6740d3fe9c440676564 (patch)
treee88f2b8ef0a2999cb45a7c83d5e88d1aa6df0044 /source/blender/draw/engines
parentd3bba94bf243c82b0c94b176f0541511e29bbcf3 (diff)
parent6cf734a2e5d2496d1b2d33bc7613b56a9f9fc2ec (diff)
Merge branch 'master' into temp_bmesh_multirestemp_bmesh_multires
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_engine.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index d3a0c40fae5..1078cebdbff 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -240,8 +240,9 @@ void GPENCIL_cache_init(void *ved)
}
else {
pd->do_onion = true;
- pd->simplify_fill = false;
- pd->simplify_fx = false;
+ Scene *scene = draw_ctx->scene;
+ pd->simplify_fill = GPENCIL_SIMPLIFY_FILL(scene, false);
+ pd->simplify_fx = GPENCIL_SIMPLIFY_FX(scene, false);
pd->fade_layer_opacity = -1.0f;
pd->playing = false;
}