griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Clément Foucault
2024-11-08 18:49:52 +01:00
parent 4799c1ebb8 03d31a3717
commit 9dbfa1f81c
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/engines/workbench/workbench_engine.cc
View File

@@ -421,6 +421,9 @@ class Instance {
GPU_framebuffer_clear_depth_stencil(resources.clear_in_front_fb, 1.0f, 0x00);
}
resources.depth_tx.wrap(depth_tx);
resources.color_tx.wrap(color_tx);
if (scene_state.render_finished) {
/* Just copy back the already rendered result */
anti_aliasing_ps.draw(manager, view, scene_state, resources, depth_in_front_tx);
@@ -429,8 +432,6 @@ class Instance {
anti_aliasing_ps.setup_view(view, scene_state);
resources.depth_tx.wrap(depth_tx);
resources.color_tx.wrap(color_tx);
GPUAttachment id_attachment = GPU_ATTACHMENT_NONE;
if (scene_state.draw_object_id) {
resources.object_id_tx.acquire(

8
source/blender/draw/engines/workbench/workbench_state.cc
View File

@@ -32,8 +32,12 @@ void SceneState::init(Object *camera_ob /*=nullptr*/)
scene = DEG_get_evaluated_scene(context->depsgraph);
GPUTexture *viewport_tx = DRW_viewport_texture_list_get()->color;
resolution = int2(GPU_texture_width(viewport_tx), GPU_texture_height(viewport_tx));
if (assign_if_different(resolution, int2(float2(DRW_viewport_size_get())))) {
/* In some cases, the viewport can change resolution without a call to `workbench_view_update`.
* This is the case when dragging a window between two screen with different DPI settings.
* (See #128712) */
reset_taa = true;
}
camera_object = camera_ob;
if (camera_object == nullptr && v3d && rv3d) {