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:
authorBrecht Van Lommel <brecht@blender.org>2022-08-30 18:20:00 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-08-31 21:04:14 +0300
commitb9998541e193b1f30728fc034c7a10daae183a08 (patch)
treebf2ed1b6f32006f93d2f36e946da404eff21704c /source/blender/render/RE_engine.h
parente665f0f497f6ea6a4cff36e977bbac29dd762c00 (diff)
Fix part of T100626: Cycles not using tiles for baking
Leading to excessive memory usage compared to Blender 2.93. There's still some avoidable memory usage remaining, due to the full float buffer in the new image editor drawing and not loading the cached EXR from disk in tiles. Main difficulty was handling multi-image baking and disk caches, which is solved by associating a unique layer name with each image so it can be matched when reading back the image from the disk. Also some minor header changes to be able to use RE_MAXNAME in RE_bake.h.
Diffstat (limited to 'source/blender/render/RE_engine.h')
-rw-r--r--source/blender/render/RE_engine.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/render/RE_engine.h b/source/blender/render/RE_engine.h
index 822f07c0dce..d5ad70e5a03 100644
--- a/source/blender/render/RE_engine.h
+++ b/source/blender/render/RE_engine.h
@@ -15,6 +15,7 @@
#include "BLI_threads.h"
+struct BakeTargets;
struct BakePixel;
struct Depsgraph;
struct Main;
@@ -140,9 +141,10 @@ typedef struct RenderEngine {
struct ReportList *reports;
struct {
+ const struct BakeTargets *targets;
const struct BakePixel *pixels;
float *result;
- int width, height, depth;
+ int image_id;
int object_id;
} bake;