diff options
Diffstat (limited to 'source/blender/render/extern/include/RE_shader_ext.h')
| -rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 5b81052f5d2..888474ffa18 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -47,7 +47,7 @@ typedef struct ShadeResult { float combined[4]; float col[4]; - float alpha; + float alpha, mist, z; float diff[3]; /* no ramps, shadow, etc */ float spec[3]; float shad[3]; @@ -64,6 +64,7 @@ struct ShadeInputCopy { struct Material *mat; struct VlakRen *vlr; + struct StrandRen *strand; struct ObjectInstanceRen *obi; struct ObjectRen *obr; int facenr; @@ -96,6 +97,7 @@ typedef struct ShadeInput struct Material *mat; struct VlakRen *vlr; + struct StrandRen *strand; struct ObjectInstanceRen *obi; struct ObjectRen *obr; int facenr; @@ -132,7 +134,8 @@ typedef struct ShadeInput /* texture coordinates */ float lo[3], gl[3], ref[3], orn[3], winco[3], sticky[3], vcol[4], rad[3]; float refcol[4], displace[3]; - float strand, tang[3], stress, winspeed[4]; + float strandco, tang[3], nmaptang[3], stress, winspeed[4]; + float duplilo[3], dupliuv[3]; ShadeInputUV uv[8]; /* 8 = MAX_MTFACE */ ShadeInputCol col[8]; /* 8 = MAX_MCOL */ @@ -154,6 +157,8 @@ typedef struct ShadeInput int xs, ys; /* pixel to be rendered */ int mask; /* subsample mask */ + float scanco[3]; /* original scanline coordinate without jitter */ + int samplenr; /* sample counter, to detect if we should do shadow again */ int depth; /* 1 or larger on raytrace shading */ @@ -166,6 +171,7 @@ typedef struct ShadeInput /* from initialize, part or renderlayer */ short do_preview; /* for nodes, in previewrender */ short thread, sample; /* sample: ShadeSample array index */ + unsigned int lay; int layflag, passflag, combinedflag; struct Group *light_override; |