[Bf-blender-cvs] [713d59bcafb] master: Fix T89587: Don't Change Line Width For Previews
Harley Acheson
noreply at git.blender.org
Wed Jan 5 00:52:20 CET 2022
Commit: 713d59bcafb18842d1f90f0a6f2b386de7585457
Author: Harley Acheson
Date: Tue Jan 4 15:51:18 2022 -0800
Branches: master
https://developer.blender.org/rB713d59bcafb18842d1f90f0a6f2b386de7585457
Fix T89587: Don't Change Line Width For Previews
Do not temporarily change U.pixelsize while creating object previews
in object_preview_render. It does nothing to the render, but the change
in line width can affect other UI drawing since it is done in a thread.
see D13717 for for details.
Differential Revision: https://developer.blender.org/D13717
Reviewed by Julian Eisel
===================================================================
M source/blender/editors/render/render_preview.cc
===================================================================
diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc
index a26103b65e1..55e37f85071 100644
--- a/source/blender/editors/render/render_preview.cc
+++ b/source/blender/editors/render/render_preview.cc
@@ -848,7 +848,6 @@ static Scene *object_preview_scene_create(const struct ObjectPreviewData *previe
static void object_preview_render(IconPreview *preview, IconPreviewSize *preview_sized)
{
Main *preview_main = BKE_main_new();
- const float pixelsize_old = U.pixelsize;
char err_out[256] = "unknown";
BLI_assert(preview->id_copy && (preview->id_copy != preview->id));
@@ -867,8 +866,6 @@ static void object_preview_render(IconPreview *preview, IconPreviewSize *preview
/* Ownership is now ours. */
preview->id_copy = nullptr;
- U.pixelsize = 2.0f;
-
View3DShading shading;
BKE_screen_view3d_shading_init(&shading);
/* Enable shadows, makes it a bit easier to see the shape. */
@@ -890,8 +887,6 @@ static void object_preview_render(IconPreview *preview, IconPreviewSize *preview
err_out);
/* TODO: color-management? */
- U.pixelsize = pixelsize_old;
-
if (ibuf) {
icon_copy_rect(ibuf, preview_sized->sizex, preview_sized->sizey, preview_sized->rect);
IMB_freeImBuf(ibuf);
More information about the Bf-blender-cvs
mailing list