Commit: 3c52c4ab0a93f7c85f05eeaff141458ea7b52dd2
Author: Bastien Montagne
Date: Fri Dec 26 18:20:45 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rB3c52c4ab0a93f7c85f05eeaff141458ea7b52dd2
Merge branch 'master' into asset-experiments
Conflicts:
release/scripts/startup/bl_ui/__init__.py
source/blender/editors/interface/interface_utils.c
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_space.c
index c8e263e,86beec7..7adc447
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -3577,39 -3291,8 +3578,40 @@@ static void rna_def_fileselect_params(B
prop = RNA_def_property(srna, "filter_glob", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "filter_glob");
RNA_def_property_ui_text(prop, "Extension Filter", "");
+ RNA_def_property_string_maxlength(prop, 63);
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_FILE_LIST, NULL);
- prop = RNA_def_property(srna, "filter_search", PROP_STRING,
PROP_SEARCH);
++ prop = RNA_def_property(srna, "filter_search", PROP_STRING, PROP_NONE);
+ RNA_def_property_string_sdna(prop, NULL, "filter_search");
+ RNA_def_property_ui_text(prop, "Name Filter", "Filter by name, supports
'*' wilcard");
+ RNA_def_property_string_maxlength(prop, 63);
++ RNA_def_property_flag(prop, PROP_TEXTEDIT_UPDATE);
+ RNA_def_property_update(prop, NC_SPACE | ND_SPACE_FILE_LIST, NULL);
+}
+
+static void rna_def_filemenu_entry(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ srna = RNA_def_struct(brna, "FileBrowserFSMenuEntry", NULL);
+ RNA_def_struct_sdna(srna, "FSMenuEntry");
+ RNA_def_struct_ui_text(srna, "File Select Parameters", "File Select
Parameters");
+
+ prop = RNA_def_property(srna, "path", PROP_STRING, PROP_FILEPATH);
+ RNA_def_property_string_sdna(prop, NULL, "path");
+ RNA_def_property_ui_text(prop, "Path", "");
+
+ prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+ RNA_def_property_string_sdna(prop, NULL, "name");
+ RNA_def_property_string_funcs(prop,
"rna_FileBrowser_FSMenuEntry_name_get", NULL,
"rna_FileBrowser_FSMenuEntry_name_set");
+ RNA_def_property_editable_func(prop,
"rna_FileBrowser_FSMenuEntry_name_get_editable");
+ RNA_def_property_ui_text(prop, "Name", "");
+
+ prop = RNA_def_property(srna, "use_save", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "save", 1);
+ RNA_def_property_ui_text(prop, "Save", "Whether this path is saved in
bookmarks, or generated from OS");
+ RNA_def_property_clear_flag(prop, PROP_EDITABLE);
}
static void rna_def_space_filebrowser(BlenderRNA *brna)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
