[Bf-blender-cvs] [3353fc60c23] master: Cleanup: remove unused members from RenderResult

Brecht Van Lommel noreply at git.blender.org
Tue Oct 4 20:24:53 CEST 2022


Commit: 3353fc60c2304e33697aa8e10f2a6b306b046feb
Author: Brecht Van Lommel
Date:   Tue Oct 4 16:56:49 2022 +0200
Branches: master
https://developer.blender.org/rB3353fc60c2304e33697aa8e10f2a6b306b046feb

Cleanup: remove unused members from RenderResult

===================================================================

M	source/blender/render/RE_pipeline.h
M	source/blender/render/intern/render_result.cc

===================================================================

diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h
index 6007a64a054..e9a90096dab 100644
--- a/source/blender/render/RE_pipeline.h
+++ b/source/blender/render/RE_pipeline.h
@@ -101,7 +101,6 @@ typedef struct RenderResult {
 
   /* target image size */
   int rectx, recty;
-  short 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 */
@@ -124,8 +123,7 @@ typedef struct RenderResult {
   /* multiView maps to a StringVector in OpenEXR */
   ListBase views; /* RenderView */
 
-  /* allowing live updates: */
-  rcti renrect;
+  /* Render layer to display. */
   RenderLayer *renlay;
 
   /* for render results in Image, verify validity for sequences */
diff --git a/source/blender/render/intern/render_result.cc b/source/blender/render/intern/render_result.cc
index d8179c4c495..e8603f5e1b3 100644
--- a/source/blender/render/intern/render_result.cc
+++ b/source/blender/render/intern/render_result.cc
@@ -251,8 +251,6 @@ RenderResult *render_result_new(Render *re,
   rr = MEM_cnew<RenderResult>("new render result");
   rr->rectx = rectx;
   rr->recty = recty;
-  rr->renrect.xmin = 0;
-  rr->renrect.xmax = rectx;
 
   /* tilerect is relative coordinates within render disprect. do not subtract crop yet */
   rr->tilerect.xmin = partrct->xmin - re->disprect.xmin;



More information about the Bf-blender-cvs mailing list