[Bf-blender-cvs] [8063d72b08d] master: Fix T60037: single column layout breaks file browse button.
Brecht Van Lommel
noreply at git.blender.org
Wed Jan 2 19:23:32 CET 2019
Commit: 8063d72b08d2e219ebb2087e6188a8f2186f398d
Author: Brecht Van Lommel
Date: Wed Jan 2 19:22:56 2019 +0100
Branches: master
https://developer.blender.org/rB8063d72b08d2e219ebb2087e6188a8f2186f398d
Fix T60037: single column layout breaks file browse button.
===================================================================
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 87927ef7643..221a88bbd1c 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -876,7 +876,7 @@ void UI_context_active_but_prop_get_filebrowser(
{
ARegion *ar = CTX_wm_region(C);
uiBlock *block;
- uiBut *but, *prevbut;
+ uiBut *but, *prevbut = NULL;
memset(r_ptr, 0, sizeof(*r_ptr));
*r_prop = NULL;
@@ -887,16 +887,18 @@ void UI_context_active_but_prop_get_filebrowser(
for (block = ar->uiblocks.first; block; block = block->next) {
for (but = block->buttons.first; but; but = but->next) {
- prevbut = but->prev;
+ if (but && but->rnapoin.data) {
+ if (RNA_property_type(but->rnaprop) == PROP_STRING) {
+ prevbut = but;
+ }
+ }
/* find the button before the active one */
- if ((but->flag & UI_BUT_LAST_ACTIVE) && prevbut && prevbut->rnapoin.data) {
- if (RNA_property_type(prevbut->rnaprop) == PROP_STRING) {
- *r_ptr = prevbut->rnapoin;
- *r_prop = prevbut->rnaprop;
- *r_is_undo = (prevbut->flag & UI_BUT_UNDO) != 0;
- return;
- }
+ if ((but->flag & UI_BUT_LAST_ACTIVE) && prevbut) {
+ *r_ptr = prevbut->rnapoin;
+ *r_prop = prevbut->rnaprop;
+ *r_is_undo = (prevbut->flag & UI_BUT_UNDO) != 0;
+ return;
}
}
}
More information about the Bf-blender-cvs
mailing list