diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-05-01 18:23:39 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-05-01 18:23:39 +0300 |
| commit | 06af6a9efa59419db023508a2f78a69bcf45d2ed (patch) | |
| tree | 0b06e0db96e377880cba3946aa362296bb8df677 /source/blender/blenkernel/intern | |
| parent | 6fff2427d623119a373e7991a319a75d65ed387e (diff) | |
| parent | 7c5e00965533b392a96f503a66aeace261024789 (diff) | |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/gpencil_modifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index 1f13f008464..d6c252b39ed 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -757,9 +757,9 @@ void BKE_gpencil_modifiers_calc(Depsgraph *depsgraph, Scene *scene, Object *ob) { bGPdata *gpd = (bGPdata *)ob->data; const bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd); - const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd); const bool is_curve_edit = (bool)GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd); const bool is_render = (bool)(DEG_get_mode(depsgraph) == DAG_EVAL_RENDER); + const bool is_multiedit = (bool)(GPENCIL_MULTIEDIT_SESSIONS_ON(gpd) && !is_render); const bool do_modifiers = (bool)((!is_multiedit) && (!is_curve_edit) && (ob->greasepencil_modifiers.first != NULL) && (!GPENCIL_SIMPLIFY_MODIF(scene))); |