Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

no remove double property lookups in ED_fileselect_set_params and redundant NULL check in file_main_area_draw.

Browse Source
This commit is contained in:
Campbell Barton
2013-08-26 06:54:05 +00:00
parent d11e419792
commit c0d67d26aa
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
source/blender/editors/space_file/filesel.c
View File

@@ -115,6 +115,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
/* set the parameters from the operator, if it exists */ /* set the parameters from the operator, if it exists */
if (op) { if (op) {
PropertyRNA *prop;
const short is_files = (RNA_struct_find_property(op->ptr, "files") != NULL); const short is_files = (RNA_struct_find_property(op->ptr, "files") != NULL);
const short is_filepath = (RNA_struct_find_property(op->ptr, "filepath") != NULL); const short is_filepath = (RNA_struct_find_property(op->ptr, "filepath") != NULL);
const short is_filename = (RNA_struct_find_property(op->ptr, "filename") != NULL); const short is_filename = (RNA_struct_find_property(op->ptr, "filename") != NULL);
@@ -163,30 +164,30 @@ short ED_fileselect_set_params(SpaceFile *sfile)
} }
params->filter = 0; params->filter = 0;
if (RNA_struct_find_property(op->ptr, "filter_blender")) if ((prop = RNA_struct_find_property(op->ptr, "filter_blender")))
params->filter |= RNA_boolean_get(op->ptr, "filter_blender") ? BLENDERFILE : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? BLENDERFILE : 0;
if (RNA_struct_find_property(op->ptr, "filter_backup")) if ((prop = RNA_struct_find_property(op->ptr, "filter_backup")))
params->filter |= RNA_boolean_get(op->ptr, "filter_backup") ? BLENDERFILE_BACKUP : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? BLENDERFILE_BACKUP : 0;
if (RNA_struct_find_property(op->ptr, "filter_image")) if ((prop = RNA_struct_find_property(op->ptr, "filter_image")))
params->filter |= RNA_boolean_get(op->ptr, "filter_image") ? IMAGEFILE : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? IMAGEFILE : 0;
if (RNA_struct_find_property(op->ptr, "filter_movie")) if ((prop = RNA_struct_find_property(op->ptr, "filter_movie")))
params->filter |= RNA_boolean_get(op->ptr, "filter_movie") ? MOVIEFILE : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? MOVIEFILE : 0;
if (RNA_struct_find_property(op->ptr, "filter_python")) if ((prop = RNA_struct_find_property(op->ptr, "filter_python")))
params->filter |= RNA_boolean_get(op->ptr, "filter_python") ? PYSCRIPTFILE : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? PYSCRIPTFILE : 0;
if (RNA_struct_find_property(op->ptr, "filter_font")) if ((prop = RNA_struct_find_property(op->ptr, "filter_font")))
params->filter |= RNA_boolean_get(op->ptr, "filter_font") ? FTFONTFILE : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FTFONTFILE : 0;
if (RNA_struct_find_property(op->ptr, "filter_sound")) if ((prop = RNA_struct_find_property(op->ptr, "filter_sound")))
params->filter |= RNA_boolean_get(op->ptr, "filter_sound") ? SOUNDFILE : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? SOUNDFILE : 0;
if (RNA_struct_find_property(op->ptr, "filter_text")) if ((prop = RNA_struct_find_property(op->ptr, "filter_text")))
params->filter |= RNA_boolean_get(op->ptr, "filter_text") ? TEXTFILE : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? TEXTFILE : 0;
if (RNA_struct_find_property(op->ptr, "filter_folder")) if ((prop = RNA_struct_find_property(op->ptr, "filter_folder")))
params->filter |= RNA_boolean_get(op->ptr, "filter_folder") ? FOLDERFILE : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FOLDERFILE : 0;
if (RNA_struct_find_property(op->ptr, "filter_btx")) if ((prop = RNA_struct_find_property(op->ptr, "filter_btx")))
params->filter |= RNA_boolean_get(op->ptr, "filter_btx") ? BTXFILE : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? BTXFILE : 0;
if (RNA_struct_find_property(op->ptr, "filter_collada")) if ((prop = RNA_struct_find_property(op->ptr, "filter_collada")))
params->filter |= RNA_boolean_get(op->ptr, "filter_collada") ? COLLADAFILE : 0; params->filter |= RNA_property_boolean_get(op->ptr, prop) ? COLLADAFILE : 0;
if (RNA_struct_find_property(op->ptr, "filter_glob")) { if ((prop = RNA_struct_find_property(op->ptr, "filter_glob"))) {
RNA_string_get(op->ptr, "filter_glob", params->filter_glob); RNA_property_string_get(op->ptr, prop, params->filter_glob);
params->filter |= (OPERATORFILE | FOLDERFILE); params->filter |= (OPERATORFILE | FOLDERFILE);
} }
else { else {

2
source/blender/editors/space_file/space_file.c
View File

@@ -328,7 +328,7 @@ static void file_main_area_draw(const bContext *C, ARegion *ar)
/* Allow dynamically sliders to be set, saves notifiers etc. */ /* Allow dynamically sliders to be set, saves notifiers etc. */
if (params && (params->display == FILE_IMGDISPLAY)) { if (params->display == FILE_IMGDISPLAY) {
v2d->scroll = V2D_SCROLL_RIGHT; v2d->scroll = V2D_SCROLL_RIGHT;
v2d->keepofs &= ~V2D_LOCKOFS_Y; v2d->keepofs &= ~V2D_LOCKOFS_Y;
v2d->keepofs |= V2D_LOCKOFS_X; v2d->keepofs |= V2D_LOCKOFS_X;