diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-01-14 18:55:44 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-01-14 18:55:44 +0300 |
| commit | ca994239bc2763cf011a54411984de08ea1a413c (patch) | |
| tree | 261d8cf23c59bb5ed714a2ff1cf6bb4fd8787de4 /source/blender/editors | |
| parent | 388d43d85a5d9dfc5261848c91c12dd883ea1f59 (diff) | |
| parent | 39d5d11e022a39383103f1e46dd74dbf5a36a850 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/screen/area.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 98bee156090..29626fb6a8f 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1437,6 +1437,11 @@ static void region_rect_recursive( BLI_rcti_init(remainder, 0, 0, 0, 0); } + /* Fix any negative dimensions. This can happen when a quad split 3d view gets to small. (see + * T72200). BLI_rcti_init() sanitizes, making sure min values are <= max values. */ + BLI_rcti_init( + &ar->winrct, ar->winrct.xmin, ar->winrct.xmax, ar->winrct.ymin, ar->winrct.ymax); + quad++; } } @@ -2897,7 +2902,7 @@ void ED_region_info_draw(ARegion *ar, float fill_color[4], const bool full_redraw) { - ED_region_info_draw_multiline(ar, (const char *[2]){text, NULL}, fill_color, full_redraw); + ED_region_info_draw_multiline(ar, (const char * [2]){text, NULL}, fill_color, full_redraw); } #define MAX_METADATA_STR 1024 diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index ee3dceb6acd..589375530f5 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -578,7 +578,8 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad ED_sequencer_deselect_all(scene); } - if (RNA_struct_property_is_set(op->ptr, "files")) { + if (RNA_struct_property_is_set(op->ptr, "files") && + RNA_struct_property_is_set(op->ptr, "directory")) { tot_files = RNA_property_collection_length(op->ptr, RNA_struct_find_property(op->ptr, "files")); } @@ -591,7 +592,7 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad char dir_only[FILE_MAX]; char file_only[FILE_MAX]; - BLI_split_dir_part(seq_load.path, dir_only, sizeof(dir_only)); + RNA_string_get(op->ptr, "directory", dir_only); RNA_BEGIN (op->ptr, itemptr, "files") { Sequence *seq; |