Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2021-10-07 17:54:26 +0300
committerSergey Sharybin <sergey@blender.org>2021-10-08 16:28:53 +0300
commit596446dbc6beeed4d371242e21cd02ef85c4426b (patch)
treedd020b5551c67f13cb45d9197a0ac81ed2297c14
parent7afde7cd22822993fa1a6f709ff0676fc71a0aaf (diff)
Fix wrong Cycles tile highlight with region render
In previous Blender version the tile highlight was stored in the full frame (un-cropped) space. This was changed with the Cycles X development and now the tiles and render result are always measured relative to the cropped region. Differential Revision: https://developer.blender.org/D12779
-rw-r--r--source/blender/editors/space_image/image_draw.c7
-rw-r--r--source/blender/render/intern/engine.c3
2 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index fc04ec1fe02..fb87c54c1db 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -112,13 +112,6 @@ static void draw_render_info(
GPU_matrix_translate_2f(x, y);
GPU_matrix_scale_2f(zoomx, zoomy);
- RenderData *rd = RE_engine_get_render_data(re);
- if (rd->mode & R_BORDER) {
- /* TODO: round or floor instead of casting to int */
- GPU_matrix_translate_2f((int)(-rd->border.xmin * rd->xsch * rd->size * 0.01f),
- (int)(-rd->border.ymin * rd->ysch * rd->size * 0.01f));
- }
-
uint pos = GPU_vertformat_attr_add(
immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
diff --git a/source/blender/render/intern/engine.c b/source/blender/render/intern/engine.c
index 790c46dad0f..5f8679b572d 100644
--- a/source/blender/render/intern/engine.c
+++ b/source/blender/render/intern/engine.c
@@ -281,11 +281,10 @@ static void render_result_to_bake(RenderEngine *engine, RenderResult *rr)
/* Render Results */
-static HighlightedTile highlighted_tile_from_result_get(Render *re, RenderResult *result)
+static HighlightedTile highlighted_tile_from_result_get(Render *UNUSED(re), RenderResult *result)
{
HighlightedTile tile;
tile.rect = result->tilerect;
- BLI_rcti_translate(&tile.rect, re->disprect.xmin, re->disprect.ymin);
return tile;
}