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:
authorSybren A. Stüvel <sybren@blender.org>2021-04-13 14:14:07 +0300
committerSybren A. Stüvel <sybren@blender.org>2021-04-13 14:14:49 +0300
commit2f367db2cc638e47aa1c6644082070c290a8532d (patch)
tree3fde1a1eba0852ee8479a55ab634572939da2008 /source/blender/editors/render/render_preview.c
parent5b08cbae513ee41bdc4544cd92ac6d6a0e68683f (diff)
Cleanup: preview rendering, push bContext a bit further down the call stack
Pass `bContext *C` a bit further down the call stack, to prevent exploding the number of parameters of `ED_preview_icon_render()`. An upcoming change will require access to yet another context member, and this can now be done without adding yet another parameter. No functional changes.
Diffstat (limited to 'source/blender/editors/render/render_preview.c')
-rw-r--r--source/blender/editors/render/render_preview.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 1b7209b164b..10e0a143d9b 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -1608,7 +1608,7 @@ static void icon_preview_free(void *customdata)
}
void ED_preview_icon_render(
- Main *bmain, Depsgraph *depsgraph, Scene *scene, ID *id, uint *rect, int sizex, int sizey)
+ const bContext *C, Scene *scene, ID *id, uint *rect, int sizex, int sizey)
{
IconPreview ip = {NULL};
short stop = false, update = false;
@@ -1616,9 +1616,9 @@ void ED_preview_icon_render(
ED_preview_ensure_dbase();
- ip.bmain = bmain;
+ ip.bmain = CTX_data_main(C);
ip.scene = scene;
- ip.depsgraph = depsgraph;
+ ip.depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
ip.owner = BKE_previewimg_id_ensure(id);
ip.id = id;
/* Control isn't given back to the caller until the preview is done. So we don't need to copy