Fix #119142: Skip linking collection inside another linked collection #119144

Pratik Borhade · 2024-03-07T07:00:38+01:00

Pratik Borhade commented

2024-03-07 07:00:38 +01:00

When linking a collection from library, it can be linked inside another
linked/overrided collection if it is selected in outliner. This can be
prevented by linking with editable parent collection.

When linking a collection from library, it can be linked inside another linked/overrided collection if it is selected in outliner. This can be prevented by linking with editable parent collection.

Pratik Borhade requested review from Bastien Montagne 2024-03-07 07:00:58 +01:00

Pratik Borhade commented

2024-03-07 07:03:43 +01:00

loose_data_instantiate_collection_process calls BKE_collection_child_add so I made the change in child_add function (might be helpful in other cases as well).
We can do this fix in loose_data_instantiate_collection_process by making the collection function non-static

`loose_data_instantiate_collection_process` calls `BKE_collection_child_add` so I made the change in `child_add` function (might be helpful in other cases as well). We can do this fix in `loose_data_instantiate_collection_process` by making the collection function non-static

Pratik Borhade added the

Module

User Interface

label 2024-03-07 07:20:39 +01:00

Bastien Montagne requested changes 2024-03-07 10:51:30 +01:00

Dismissed

Bastien Montagne left a comment

I'd rather not modify BKE core function to add such checks, especially now that we are more and more going into allowing some code to edit linked data (like liboverride resync, doversion, etc.).

IMHO the code that needs to be fixed here is loose_data_instantiate_ensure_active_collection, which should ensure that instantiate_context->active_collection is not linked data.

I'd rather not modify BKE core function to add such checks, especially now that we are more and more going into allowing some code to edit linked data (like liboverride resync, doversion, etc.). IMHO the code that needs to be fixed here is `loose_data_instantiate_ensure_active_collection`, which should ensure that `instantiate_context->active_collection` is not linked data.

Bastien Montagne approved these changes 2024-03-07 14:13:07 +01:00

Dismissed

Bastien Montagne left a comment

Besides small suggestion below, LGTM, thanks for the fix!

source/blender/blenkernel/intern/blendfile_link_append.cc Outdated

						
				@ -524,7 +524,8 @@ static void loose_data_instantiate_ensure_active_collection(

				  if (instantiate_context->active_collection == nullptr) {

Bastien Montagne commented

2024-03-07 14:12:47 +01:00

I would add a comment here, stating that in case the active_collection is non-null, it is assumed to be editable.

I would add a comment here, stating that in case the `active_collection` is non-null, it is assumed to be editable.

Bastien Montagne commented

2024-03-07 14:13:19 +01:00

@blender-bot build

Bastien Montagne commented

2024-03-07 14:14:37 +01:00

Oh! Just realized you created this fix against main.

It should rather be committed to 4.1, then merge 4.1 into main, and add the fix to the backport lists for the active LTS too (3.6 and 3.3).

Oh! Just realized you created this fix against main. It should rather be committed to 4.1, then merge 4.1 into main, and add the fix to the backport lists for the active LTS too (3.6 and 3.3).

👍 1

Pratik Borhade force-pushed 119142-link-collection from f71917dc43 to dd3425a02e

2024-03-08 04:36:51 +01:00

Compare

PratikPB2123 changed target branch from main to blender-v4.1-release

2024-03-08 04:37:47 +01:00

Pratik Borhade commented

2024-03-08 04:45:17 +01:00

@blender-bot build

Pratik Borhade added 1 commit 2024-03-08 04:54:14 +01:00