[Bf-blender-cvs] [4273836cdc0] lanpr-under-gp: LANPR: Fix deleting GP cause UI crash problem.

[YimingWu]

Commit: 4273836cdc0942bd1b1e171418924eaca38deb11
Author: YimingWu
Date:   Wed Jun 10 21:58:21 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB4273836cdc0942bd1b1e171418924eaca38deb11

LANPR: Fix deleting GP cause UI crash problem.

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

M	source/blender/blenkernel/intern/collection.c
M	source/blender/editors/lanpr/lanpr_cpu.c

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

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index dd99654e2d4..59ccf5f7394 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -146,6 +146,10 @@ static void collection_foreach_id(ID *id, LibraryForeachIDData *data)
 {
   Collection *collection = (Collection *)id;
 
+  if (collection->lanpr) {
+    BKE_LIB_FOREACHID_PROCESS(data, collection->lanpr->target, IDWALK_CB_NOP);
+  }
+
   LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) {
     BKE_LIB_FOREACHID_PROCESS(data, cob->ob, IDWALK_CB_USER);
   }
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index 9f283181159..01a0951181f 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -4328,6 +4328,7 @@ static int lanpr_bake_gp_strokes_exec(bContext *C, wmOperator *UNUSED(op))
     // BKE_scene_frame_set(scene,frame);
     DEG_evaluate_on_framechange(CTX_data_main(C), dg, frame);
 
+    BLI_spin_lock(&lanpr_share.lock_loader);
     ED_lanpr_compute_feature_lines_internal(dg, 0);
 
     ED_lanpr_chain_clear_picked_flag(lanpr_share.render_buffer_shared);