diff options
author | Campbell Barton <campbell@blender.org> | 2022-07-08 04:09:47 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-07-08 04:33:22 +0300 |
commit | b98a937db64c365de889adcc084248716607521d (patch) | |
tree | 719676f667faf29970deba9d164676c79eac0108 /source/blender/makesdna | |
parent | 03173d63c01aede48f361ce83f53e5e9d8236c05 (diff) |
Fix T99364: Unable to select bones when custom shape display is disabled
Regression in [0] which revealed an error in [1].
Logic for pose channel custom transform ignored ARM_NO_CUSTOM.
[0]: 3267c91b4d5caab7da8aef071a446dd2e86f86a9
[1]: c3fef001ee926fc183255b623f56da9fc5fcbb73
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 516d3ce94f9..53e87e905b5 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -251,12 +251,18 @@ typedef struct bPoseChannel { /** Motion path cache for this bone. */ bMotionPath *mpath; - /** Draws custom object instead of default bone shape. */ + /** + * Draws custom object instead of default bone shape. + * + * \note For the purpose of user interaction (selection, display etc), + * it's important this value is treated as NULL when #ARM_NO_CUSTOM is set. + */ struct Object *custom; /** - * Odd feature, display with another bones transform. - * needed in rare cases for advanced rigs, - * since the alternative is highly complicated - campbell + * This is a specific feature to display with another bones transform. + * Needed in rare cases for advanced rigs, since alternative solutions are highly complicated. + * + * \note This depends #bPoseChannel.custom being set and the #ARM_NO_CUSTOM flag being unset. */ struct bPoseChannel *custom_tx; float custom_scale; /* Deprecated */ |