Commit: 4b0a94661c058e0f0111e4cbdd50b50b02841648 Author: Hans Goudey Date: Thu Jul 23 11:36:40 2020 -0400 Branches: property-search-ui https://developer.blender.org/rB4b0a94661c058e0f0111e4cbdd50b50b02841648
Property Search: Clean up some unecessary changes =================================================================== M release/scripts/startup/bl_ui/space_properties.py M source/blender/editors/interface/interface.c M source/blender/editors/interface/interface_layout.c M source/blender/makesrna/intern/rna_space.c =================================================================== diff --git a/release/scripts/startup/bl_ui/space_properties.py b/release/scripts/startup/bl_ui/space_properties.py index 35a4e608785..c5b019d58bb 100644 --- a/release/scripts/startup/bl_ui/space_properties.py +++ b/release/scripts/startup/bl_ui/space_properties.py @@ -52,7 +52,7 @@ class PROPERTIES_PT_navigation_bar(Panel): layout.scale_x = 1.4 layout.scale_y = 1.4 - if (view.filter_text): + if view.filter_text: layout.prop_tabs_enum(view, "context", data_highlight=view, property_highlight="context_search_filter_active", icon_only=True) else: diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 05abc16fafd..aea24304127 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3356,7 +3356,7 @@ uiBlock *UI_block_begin(const bContext *C, ARegion *region, const char *name, sh block->dt = dt; block->evil_C = (void *)C; /* XXX */ - /* Set the search filter int he properties area. */ + /* Set the search filter in the properties editor. */ if ((region && region->regiontype == RGN_TYPE_WINDOW) && (area && area->spacetype == SPACE_PROPERTIES)) { SpaceProperties *sbuts = CTX_wm_space_properties(C); diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index b83294a86ec..3ac38a4465e 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -2171,6 +2171,7 @@ void uiItemFullR(uiLayout *layout, /* Split the label / property. */ uiLayout *layout_parent = layout; + if (use_prop_sep) { uiLayout *layout_row = NULL; #ifdef UI_PROP_DECORATE @@ -5979,9 +5980,6 @@ void uiLayoutSetFunc(uiLayout *layout, uiMenuHandleFunc handlefunc, void *argv) layout->root->argv = argv; } -/** - * Finish the layout process and solve for the size of a block. - */ void UI_block_layout_resolve(uiBlock *block, int *r_x, int *r_y) { uiLayoutRoot *root; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 5833ebffd29..dbad8a536d5 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1806,27 +1806,6 @@ static const EnumPropertyItem *rna_SpaceProperties_context_itemf(bContext *UNUSE return item; } -// static const int rna_SpaceProperties_context_search_filter_active_get(PointerRNA *ptr) -// { -// SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); - -// int context_tabs_array[32]; -// int totitem = ED_buttons_tabs_list(sbuts, context_tabs_array); - -// int retval = 0; -// for (int i = 0; i < totitem; i++) { -// if (context_tabs_array[i] == -1) { -// continue; -// } -// int tab_context = context_tabs_array[i]; -// if (sbuts->context_search_filter_active & (1 << tab_context)) { -// retval |= (1 << i); -// } -// } - -// return retval; -// } - static void rna_SpaceProperties_context_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs