MAYA-123361 fix unshared stage toggling and loading #2410
Conversation
pierrebai-adsk
commented
Jun 10, 2022
pierrebai-adsk
commented
- Add two new stage caches for unshared stages.
- These are necessary to be able to find unshared stages when toggling between shared and unshared.
- Do not pass an explicit sesssion layer when opening a stage unless unshared stage is explicitly desired.
- That is because the cache takes into consideration the session layer if given as an argument, which would unshare layers unintetionally.
- In particular, choosing to target the session layer (which is UI consideration) would indirectly make the stage unshared.
- Properly reload unshare stage and toggle between shared and unshared stage by transferring the content of the session layer.
- Clarify with comments the design and behaviour of the stage proxy shape.
- Adapted AL code to conform to the new API.
- Add unit test for session preservation
- Add two new stage caches for unshared stages. - These are necessary to be able to find unshared stages when toggling between shared and unshared. - Do *not* pass an explicit sesssion layer when opening a stage unless unshared stage is explicitly desired. - That is because the cache takes into consideration the session layer if given as an argument, which would unshare layers unintetionally. - In particular, choosing to target the session layer (which is UI consideration) would indirectly make the stage unshared. - Properly reload unshare stage and toggle between shared and unshared stage by transferring the content of the session layer. - Clarify with comments the design and behaviour of the stage proxy shape. - Adapted AL code to conform to the new API. - Add unit test for session preservation
| @@ -798,34 +805,49 @@ MStatus MayaUsdProxyShapeBase::computeInStageDataCached(MDataBlock& dataBlock) | |||
| = MGlobal::optionVarIntValue(kSessionLayerOptionVarName) == 1; | |||
| targetSession = targetSession || !rootLayer->PermissionToEdit(); | |||
|
|
|||
| if (sessionLayer || targetSession) { | |||
| if (!sessionLayer) | |||
There was a problem hiding this comment.
When targeting the session layer without a named session layer loaded from Maya scene, it would create a new session layer. This would prevent reusing a previously shared stage. Target session vs stage sharing are orthogonal. I looked at the original github issue and PR and the goal was to be able to target the session, with no discussion about affecting stage sharing.
I think the code was unwittingly written to have that side effect, so I fixed it.
…usly set session layer.
| const auto shareMode = isShareableStage() ? ShareMode::Shared : ShareMode::Unshared; | ||
| if (shareMode == _previousShareMode) | ||
| return; | ||
|
|
There was a problem hiding this comment.
On thing I was not sure of: do I need to reset the previous share mode in some cases? For example, if the user edits the filename, would we need to reset the flag? Where and when, through what mechanism would that be done?
I did not see that any other member variable get reset in these cases, so I did not do anything about it for this flag.
There was a problem hiding this comment.
Resetting the share mode on file (i.e. root layer) change is an interesting question. I think you'll need to follow up with Design here so that we can schedule some time for this.
| const auto shareMode = isShareableStage() ? ShareMode::Shared : ShareMode::Unshared; | ||
| if (shareMode == _previousShareMode) | ||
| return; | ||
|
|
There was a problem hiding this comment.
Resetting the share mode on file (i.e. root layer) change is an interesting question. I think you'll need to follow up with Design here so that we can schedule some time for this.
- Fix typos. - Simplify code. - More efficient ref-counted pointer passing.
|
PF passed except the know testProxyShapeDrawUsdChangeProcessing in 2022 Linux interactive. |
pierrebai-adsk
added
the
ready-for-merge
