Details

Reviewers

Maniphest Tasks

T77408: Continued Outliner Improvements Design

Commits

rBb0741e1dcbc5: Outliner: Use right click target element for context menu

Summary

It would be nice to refactor the outliner context menu, but a project of that scale didn't end up fitting into the gsoc. There are some smaller annoyances that this patch addresses.

When opening the context menu with mixed type selection, the menu does not show operators based on the target of the right click. For example, if a modifier and the parent object are selected, a right click on the modifier does not show the modifier context menu, rather it shows the object context menu. The menu type shown should depend on the target of the right click.

This patch modifies the code to only check the data type of the right click rather than iterating over the tree and trying to determine what type of menu to create. For this to work, the active element is now set on right click so the operators called from the context menu know which type of data to operate on.

Diff Detail

Repository

rB Blender

Branch

outliner-context-menu (branched from master)

Build Status

Buildable 9669
Build 9669: arc lint + arc unit

Event Timeline

Nathan Craddock (natecraddock) requested review of this revision.Aug 20 2020, 12:41 AM

Nathan Craddock (natecraddock) created this revision.

Harbormaster completed remote builds in B9669: Diff 27948.Aug 20 2020, 12:41 AM

Nathan Craddock (natecraddock) mentioned this in T77408: Continued Outliner Improvements Design.Aug 20 2020, 12:41 AM

Nathan Craddock (natecraddock) edited the summary of this revision. (Show Details)

Nathan Craddock (natecraddock) added a project: User Interface.

Fix: Right click not setting the active object

Harbormaster completed remote builds in B9742: Diff 28067.Aug 23 2020, 4:57 AM

Nathan Craddock (natecraddock) edited the summary of this revision. (Show Details)Aug 23 2020, 5:01 AM

Nathan Craddock (natecraddock) added a project: Restricted Project.

Julian Eisel (Severin) mentioned this in D8648: Outliner: Create new collection with selected objects.Sep 9 2020, 7:26 PM

Only one thing to fix. Otherwise, LGTM.

source/blender/editors/space_outliner/outliner_tools.c
403–404	`TSE_LAYER_COLLECTION` collection is an ID type, but does not get `TreeStoreElem.type` set to 0. I think that's because of compatibility from when collections weren't IDs. If you right click the default collection and do ID Data > Delete, it does nothing.

This revision now requires changes to proceed.Sep 9 2020, 9:14 PM

Fix: ID Data -> Delete on collections

In D8647#216765, @Julian Eisel (Severin) wrote:

Only one thing to fix. Otherwise, LGTM.

I had forgotten about my TODO question there, thanks for answering. Replacing the TSE_LAYER_COLLECTION condition caused an assert failure, so I added the TSE_LAYER_COLLECTION as a condition to the assert. I believe that was the proper fix since that is an exception to the ID data case in the tree elements.

Harbormaster completed remote builds in B10106: Diff 28725.Sep 10 2020, 6:32 AM

Julian Eisel (Severin) added a task: T77408: Continued Outliner Improvements Design.Sep 10 2020, 2:48 PM

Julian Eisel (Severin) accepted this revision.Sep 10 2020, 4:49 PM

This revision is now accepted and ready to land.Sep 10 2020, 4:49 PM

Julian Eisel (Severin) added inline comments.Sep 10 2020, 5:02 PM

source/blender/editors/space_outliner/outliner_edit.c
495 ↗	(On Diff #28725)	Just noticed this removes the `id` null-check. I'd just add another assert for that, because `id` really shouldn't be `NULL`.