[Bf-blender-cvs] [eb911610d05] master: Fix ugly alignment of "Mono" option in the Sequencer
Julian Eisel
noreply at git.blender.org
Tue Sep 1 17:10:54 CEST 2020
Commit: eb911610d050287e1f6f3c7c2f16788f8eb6efa6
Author: Julian Eisel
Date: Tue Sep 1 17:01:50 2020 +0200
Branches: master
https://developer.blender.org/rBeb911610d050287e1f6f3c7c2f16788f8eb6efa6
Fix ugly alignment of "Mono" option in the Sequencer
Steps to reproduce were:
* Open Sequencer, add a sound strip
* In the sidebar, open the Adjust > Sound sub-panel
* Note the placement of the "Mono" item
The layout code would disable decorators if a property came from a
non-animatable data-block type. Doing so would mess up the alignment
where properties from different data-block types were be mixed.
This is not the case any more.
Note that when actually adding the decorator, a blank icon is inserted
to keep the alignment intact when the data-block type isn't animatable.
So the decorator is still not shown, but the alignment looks fine.
This may affect more cases. If so, and if that's an issue, the
decorators should be explicitly disabled.
===================================================================
M source/blender/editors/interface/interface_layout.c
===================================================================
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 8184962a54b..f7955c15dc4 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1977,9 +1977,7 @@ void uiItemFullR(uiLayout *layout,
uiLayout *layout;
uiBut *but;
} ui_decorate = {
- .use_prop_decorate = (((layout->item.flag & UI_ITEM_PROP_DECORATE) != 0) &&
- (use_prop_sep && ptr->owner_id &&
- id_can_have_animdata(ptr->owner_id))),
+ .use_prop_decorate = (((layout->item.flag & UI_ITEM_PROP_DECORATE) != 0) && use_prop_sep),
};
#endif /* UI_PROP_DECORATE */
More information about the Bf-blender-cvs
mailing list