diff options
| author | Michael Kowalski <makowalski@nvidia.com> | 2022-11-08 03:37:51 +0300 |
|---|---|---|
| committer | Michael Kowalski <makowalski@nvidia.com> | 2022-11-08 03:37:51 +0300 |
| commit | a400935d29f54b9bd821d093873eb4643a279e59 (patch) | |
| tree | 5dbd37ed111ee47c0dbe5696b834c3a16e96435c /source/blender/editors/space_sequencer/sequencer_drag_drop.c | |
| parent | 036e10e5462b95ec6a12e9dd4a900ba7ff05032c (diff) | |
| parent | d8dab1ba978e32af9af581fbd4c4bc0682278703 (diff) | |
Merge branch 'tmp-vfx-platform-2023' into tmp-dynamic-usdtmp-dynamic-usd
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_drag_drop.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_drag_drop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_drag_drop.c b/source/blender/editors/space_sequencer/sequencer_drag_drop.c index c892e7d7e55..d43ce26d2a1 100644 --- a/source/blender/editors/space_sequencer/sequencer_drag_drop.c +++ b/source/blender/editors/space_sequencer/sequencer_drag_drop.c @@ -505,8 +505,8 @@ typedef struct DropJobData { } DropJobData; static void prefetch_data_fn(void *custom_data, - short *UNUSED(stop), - short *UNUSED(do_update), + bool *UNUSED(stop), + bool *UNUSED(do_update), float *UNUSED(progress)) { DropJobData *job_data = (DropJobData *)custom_data; |