diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-05-22 23:59:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-22 23:59:02 +0300 |
| commit | 86fa8dc7f73a38404c276351710a2226d0fc4510 (patch) | |
| tree | 1abf8280d253f9d9d418b968af64715ffd2c9048 | |
| parent | ece8ecb4ddd2a12791b18aaf73ce8faa3dae7754 (diff) | |
| parent | e8dd8c2829f38a4939116f498c4aa3ded34cd57f (diff) | |
Merge branch 'blender-v2.83-release'
| -rw-r--r-- | intern/cycles/kernel/kernel_film.h | 8 | ||||
| -rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_film.h b/intern/cycles/kernel/kernel_film.h index 3829426f261..8344f4b4f47 100644 --- a/intern/cycles/kernel/kernel_film.h +++ b/intern/cycles/kernel/kernel_film.h @@ -28,13 +28,13 @@ ccl_device float4 film_get_pass_result(KernelGlobals *kg, int display_pass_components = kernel_data.film.display_pass_components; if (display_pass_components == 4) { - ccl_global float4 *in = (ccl_global float4 *)(buffer + display_pass_stride + - index * kernel_data.film.pass_stride); + float4 in = *(ccl_global float4 *)(buffer + display_pass_stride + + index * kernel_data.film.pass_stride); float alpha = use_display_sample_scale ? - (kernel_data.film.use_display_pass_alpha ? in->w : 1.0f / sample_scale) : + (kernel_data.film.use_display_pass_alpha ? in.w : 1.0f / sample_scale) : 1.0f; - pass_result = make_float4(in->x, in->y, in->z, alpha); + pass_result = make_float4(in.x, in.y, in.z, alpha); int display_divide_pass_stride = kernel_data.film.display_divide_pass_stride; if (display_divide_pass_stride != -1) { diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 66157296064..dc258157afd 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -848,6 +848,10 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks) CFRelease(volEnum); + /* kLSSharedFileListFavoriteItems is deprecated, but available till macOS 10.15. + * Will have to find a new method to sync the Finder Favorites with File Browser. */ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" /* Finally get user favorite places */ if (read_bookmarks) { UInt32 seed; @@ -891,6 +895,7 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks) CFRelease(pathesArray); CFRelease(list); } +# pragma GCC diagnostic pop } # else /* unix */ |