[Bf-blender-cvs] [018c9af446d] master: Fix T56120: bad property access (from 2.8)

Campbell Barton noreply at git.blender.org
Sun Jul 29 04:11:07 CEST 2018


Commit: 018c9af446de10f038a6e641ca3a61ce451a7c92
Author: Campbell Barton
Date:   Sun Jul 29 12:09:00 2018 +1000
Branches: master
https://developer.blender.org/rB018c9af446de10f038a6e641ca3a61ce451a7c92

Fix T56120: bad property access (from 2.8)

Thanks to @brita_ for the fix.

===================================================================

M	source/blender/editors/space_file/file_panels.c

===================================================================

diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c
index c5350750af4..a40334098d7 100644
--- a/source/blender/editors/space_file/file_panels.c
+++ b/source/blender/editors/space_file/file_panels.c
@@ -80,17 +80,21 @@ static void file_panel_operator(const bContext *C, Panel *pa)
 	UI_block_func_set(uiLayoutGetBlock(pa->layout), file_draw_check_cb, NULL, NULL);
 
 	/* Hack: temporary hide.*/
-	const char *hide[3] = {"filepath", "directory", "filename"};
+	const char *hide[] = {"filepath", "directory", "filename", "files"};
 	for (int i = 0; i < ARRAY_SIZE(hide); i++) {
-		PropertyRNA *prop = RNA_struct_find_property(op->ptr, "filepath");
-		RNA_def_property_flag(prop, PROP_HIDDEN);
+		PropertyRNA *prop = RNA_struct_find_property(op->ptr, hide[i]);
+		if (prop) {
+			RNA_def_property_flag(prop, PROP_HIDDEN);
+		}
 	}
 
 	uiTemplateOperatorPropertyButs(C, pa->layout, op, '\0', UI_TEMPLATE_OP_PROPS_SHOW_EMPTY);
 
 	for (int i = 0; i < ARRAY_SIZE(hide); i++) {
-		PropertyRNA *prop = RNA_struct_find_property(op->ptr, "filepath");
-		RNA_def_property_clear_flag(prop, PROP_HIDDEN);
+		PropertyRNA *prop = RNA_struct_find_property(op->ptr, hide[i]);
+		if (prop) {
+			RNA_def_property_clear_flag(prop, PROP_HIDDEN);
+		}
 	}
 
 	UI_block_func_set(uiLayoutGetBlock(pa->layout), NULL, NULL, NULL);



More information about the Bf-blender-cvs mailing list