diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2015-04-29 17:26:30 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2015-04-29 17:55:53 +0300 |
commit | 3e6a66b9dee4e0b034a1de83fbd242191858a7df (patch) | |
tree | a585414e8d9c26e66c73555e30727597ff1652ab /source/blender/render/extern | |
parent | 18ba32df37aa84d0a7c884bd1945772df0d9c59f (diff) |
Multi-View cleanup: using RenderResult->rect* only for temporary RenderResults
Originally I wanted to get rid of RenderResult->rect* entirely, but it's
convenient to have for temporary structs.
This patch makes sure they are used only when really needed, which
should help clearing the code out.
(they are needed when using RE_AcquireResultImage() - which produces a
RenderResult with no RenderView)
Reviewers: sergey
Differential Revision: https://developer.blender.org/D1270
Diffstat (limited to 'source/blender/render/extern')
-rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 2c3ad74c7e3..2df4cde2b27 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -138,6 +138,9 @@ typedef struct RenderResult { int rectx, recty; short crop, sample_nr; + /* the following rect32, rectf and rectz buffers are for temporary storage only, for RenderResult structs + * created in #RE_AcquireResultImage - which do not have RenderView */ + /* optional, 32 bits version of picture, used for ogl render and image curves */ int *rect32; /* if this exists, a copy of one of layers, or result of composited layers */ @@ -353,14 +356,8 @@ bool RE_allow_render_generic_object(struct Object *ob); bool RE_HasFakeLayer(RenderResult *res); bool RE_RenderResult_is_stereo(RenderResult *res); - struct RenderView *RE_RenderViewGetById(struct RenderResult *res, const int view_id); struct RenderView *RE_RenderViewGetByName(struct RenderResult *res, const char *viewname); -float *RE_RenderViewGetRectf(struct RenderResult *rr, const int view_id); -float *RE_RenderViewGetRectz(struct RenderResult *rr, const int view_id); -int *RE_RenderViewGetRect32(struct RenderResult *rr, const int view_id); -void RE_RenderViewSetRectf(struct RenderResult *res, const int view_id, float *rect); -void RE_RenderViewSetRectz(struct RenderResult *res, const int view_id, float *rect); #endif /* __RE_PIPELINE_H__ */ |