[Bf-blender-cvs] [e9489757ea5] property-search-ui-v2: Merge branch 'properties-pin-operator' into property-search-ui-v2
Hans Goudey
noreply at git.blender.org
Wed Sep 9 18:11:50 CEST 2020
Commit: e9489757ea50e242dba8e55af94db2329bf9e198
Author: Hans Goudey
Date: Wed Sep 9 11:02:03 2020 -0500
Branches: property-search-ui-v2
https://developer.blender.org/rBe9489757ea50e242dba8e55af94db2329bf9e198
Merge branch 'properties-pin-operator' into property-search-ui-v2
===================================================================
===================================================================
diff --cc source/blender/editors/interface/interface_panel.c
index 8f1cfb84eee,5c4877534f6..e6c2ab8e705
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@@ -248,9 -229,7 +247,8 @@@ static Panel *UI_panel_add_instanced_ex
panel->type = panel_type;
BLI_strncpy(panel->panelname, panel_type->idname, sizeof(panel->panelname));
- panel->runtime.list_index = list_index;
panel->runtime.custom_data_ptr = custom_data;
+ panel->runtime_flag |= PNL_NEW_ADDED;
/* Add the panel's children too. Although they aren't instanced panels, we can still use this
* function to create them, as UI_panel_begin does other things we don't need to do. */
diff --cc source/blender/editors/screen/area.c
index 813253b18e7,8ec58b4c75e..c145dfd0278
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@@ -2594,10 -2568,9 +2594,10 @@@ static void ed_panel_draw(const bContex
strncpy(block_name, pt->idname, BKE_ST_MAXNAME);
if (unique_panel_str != NULL) {
/* Instanced panels should have already been added at this point. */
- strncat(block_name, unique_panel_str, LIST_PANEL_UNIQUE_STR_LEN);
+ strncat(block_name, unique_panel_str, INSTANCED_PANEL_UNIQUE_STR_LEN);
}
uiBlock *block = UI_block_begin(C, region, block_name, UI_EMBOSS);
+ UI_block_set_search_only(block, search_only);
bool open;
panel = UI_panel_begin(region, lb, block, pt, panel, &open);
diff --cc source/blender/editors/space_graph/graph_buttons.c
index e8e48b505e5,47f910402fe..ba3ed620ff1
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@@ -437,11 -437,11 +437,11 @@@ static void graph_panel_key_properties(
0,
0,
0,
- -1,
- -1,
+ 0,
+ 0,
NULL);
- uiItemL_respect_property_split(col, IFACE_("Value"), ICON_NONE);
+ uiItemL_respect_property_split(col, IFACE_("Value"), ICON_NONE, NULL);
but = uiDefButR(block,
UI_BTYPE_NUM,
B_REDR,
More information about the Bf-blender-cvs
mailing list