Merge branch 'blender-v2.83-release'

2020-04-17 22:04:10 +02:00 · 2020-04-17 22:04:10 +02:00 · a6c14faa06
parent 59d7fbb052 76b3aac802
commit a6c14faa06
1 changed files with 5 additions and 0 deletions
--- a/source/blender/draw/engines/overlay/overlay_gpencil.c
+++ b/source/blender/draw/engines/overlay/overlay_gpencil.c
@ -267,6 +267,11 @@ static void OVERLAY_edit_gpencil_cache_populate(OVERLAY_Data *vedata, Object *ob
  const DRWContextState *draw_ctx = DRW_context_state_get();
  View3D *v3d = draw_ctx->v3d;

+  /* Overlay is only for active object. */
+  if (ob != draw_ctx->obact) {
+    return;
+  }
+
  if (pd->edit_gpencil_wires_grp) {
    DRWShadingGroup *grp = DRW_shgroup_create_sub(pd->edit_gpencil_wires_grp);
    DRW_shgroup_uniform_vec4_copy(grp, "gpEditColor", gpd->line_color);