dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.0-release'

Browse Source
This commit is contained in:
Sebastian Parborg
2023-10-23 15:03:43 +02:00
parent 357c213cde 72d011a87c
commit b77209e617
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
intern/ghost/intern/GHOST_SystemWayland.cc
+1 -1
View File
@@ -3925,7 +3925,7 @@ static void keyboard_handle_keymap(void *data,
if (seat->xkb.compose_state) {
xkb_compose_state_reset(seat->xkb.compose_state);
}
else {
else if (seat->xkb.compose_table) {
seat->xkb.compose_state = xkb_compose_state_new(seat->xkb.compose_table,
XKB_COMPOSE_STATE_NO_FLAGS);
}
source/blender/editors/space_view3d/view3d_draw.cc
+5 -9
View File
@@ -1916,16 +1916,12 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Depsgraph *depsgraph,
bool is_ortho = false;
float winmat[4][4];
/* Determine desired offscreen format depending on HDR availability. */
bool use_hdr = false;
if (scene && ((scene->view_settings.flag & COLORMANAGE_VIEW_USE_HDR) != 0)) {
use_hdr = GPU_hdr_support();
}
eGPUTextureFormat desired_format = (use_hdr) ? GPU_RGBA16F : GPU_RGBA8;
/* Guess format based on output buffer. */
eGPUTextureFormat desired_format = (imbuf_flag & IB_rectfloat) ? GPU_RGBA16F : GPU_RGBA8;
if (ofs && ((GPU_offscreen_width(ofs) != sizex) || (GPU_offscreen_height(ofs) != sizey) ||
(GPU_offscreen_format(ofs) != desired_format)))
{
if (ofs && ((GPU_offscreen_width(ofs) != sizex) || (GPU_offscreen_height(ofs) != sizey))) {
/* If offscreen has already been created, recreate with the same format. */
desired_format = GPU_offscreen_format(ofs);
/* sizes differ, can't reuse */
ofs = nullptr;
}