[Bf-blender-cvs] [ed94a8d] multiview: Removing XXX MV: new TODO acolrect and scolrect are not supported by multiview
Dalai Felinto
noreply at git.blender.org
Thu Apr 2 23:56:08 CEST 2015
Commit: ed94a8def21d6ad4f941ef6a6d8bac6135f6766a
Author: Dalai Felinto
Date: Thu Apr 2 18:50:26 2015 -0300
Branches: multiview
https://developer.blender.org/rBed94a8def21d6ad4f941ef6a6d8bac6135f6766a
Removing XXX MV: new TODO acolrect and scolrect are not supported by multiview
===================================================================
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/intern/source/zbuf.c
===================================================================
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index cd29065..b8ecd31 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -114,6 +114,9 @@ typedef struct RenderLayer {
struct Material *mat_override;
struct Group *light_override;
+ /* TODO (dfelinto): acolrect and scolrect are not supported by multiview at the moment.
+ * If they are really required they should be in RenderView instead */
+
float *acolrect; /* 4 float, optional transparent buffer, needs storage for display updates */
float *scolrect; /* 4 float, optional strand buffer, needs storage for display updates */
int *display_buffer; /* 4 char, optional color managed display buffer which is used when
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index b587cc6..9d2bc8f 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -4055,7 +4055,6 @@ unsigned short *zbuffer_transp_shade(RenderPart *pa, RenderLayer *rl, float *pas
/* zero alpha pixels get speed vector max again */
if (addpassflag & SCE_PASS_VECTOR)
if (rl->layflag & SCE_LAY_SOLID) {
- /* XXX MV probably never wants to use acolrect */
float *rect = RE_RenderLayerGetPass(rl, SCE_PASS_COMBINED, R.viewname);
reset_sky_speedvectors(pa, rl, rl->acolrect ? rl->acolrect : rect); /* if acolrect is set we use it */
}
More information about the Bf-blender-cvs
mailing list