blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix #119854: Avoid unsetting HIDDEN flag to properties #119881

Manually merged
Campbell Barton merged 3 commits from guishe/blender:fix-hidden-override into main 2024-04-20 07:01:17 +02:00
Conversation 2 Commits 3 Files Changed 1 +5 -2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/space_file/file_panels.cc
View File

@ -68,10 +68,13 @@ static void file_panel_operator(const bContext *C, Panel *panel)
/* Hack: temporary hide. */
const char *hide[] = {"filepath", "files", "directory", "filename"};
/* Track overridden properties with #PROP_HIDDEN flag. */
bool hidden_override[ARRAY_SIZE(hide)]{false};
guishe marked this conversation as resolved Outdated
Campbell Barton commented 2024-03-26 04:58:55 +01:00
Outdated
Review
Copy Link

Replace 4 with ARRAY_SIZE(hide) to avoid errors in the future.

Replace `4` with `ARRAY_SIZE(hide)` to avoid errors in the future.
for (int i = 0; i < ARRAY_SIZE(hide); i++) {
PropertyRNA *prop = RNA_struct_find_property(op->ptr, hide[i]);
if (prop) {
if (prop && !(RNA_property_flag(prop) & PROP_HIDDEN)) {
RNA_def_property_flag(prop, PROP_HIDDEN);
hidden_override[i] = true;
}
}
@ -81,7 +84,7 @@ static void file_panel_operator(const bContext *C, Panel *panel)
/* Hack: temporary hide. */
for (int i = 0; i < ARRAY_SIZE(hide); i++) {
PropertyRNA *prop = RNA_struct_find_property(op->ptr, hide[i]);
if (prop) {
if (prop && hidden_override[i]) {
RNA_def_property_clear_flag(prop, PROP_HIDDEN);
}
}