diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:07:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:07:48 +0300 |
commit | a25c11fd8d602236f36c34c342453149bdc1d909 (patch) | |
tree | c1e537d7ef21767130c459914313517671d0170b /source/blender/render/extern/include | |
parent | 009c38df5303f0a32eed2962650b89ebd6ae2e46 (diff) |
Cleanup: trailing space
Remove from blender/nodes, collada, blenfont & render.
Diffstat (limited to 'source/blender/render/extern/include')
-rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 22 | ||||
-rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 28 |
2 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 5c979be2cb6..71988394881 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -102,12 +102,12 @@ typedef struct RenderPass { /* after render, the Combined pass is in combined, for renderlayers read from files it is a real pass */ typedef struct RenderLayer { struct RenderLayer *next, *prev; - + /* copy of RenderData */ char name[RE_MAXNAME]; unsigned int lay, lay_zmask, lay_exclude; int layflag, passflag, pass_xor; - + struct Material *mat_override; struct Group *light_override; @@ -122,18 +122,18 @@ typedef struct RenderLayer { /* optional saved endresult on disk */ void *exrhandle; - + ListBase passes; - + } RenderLayer; typedef struct RenderResult { struct RenderResult *next, *prev; - + /* target image size */ 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 */ @@ -143,25 +143,25 @@ typedef struct RenderResult { float *rectf; /* if this exists, a copy of one of layers, or result of composited layers */ float *rectz; - + /* coordinates within final image (after cropping) */ rcti tilerect; /* offset to apply to get a border render in full image */ int xof, yof; - + /* the main buffers */ ListBase layers; - + /* multiView maps to a StringVector in OpenEXR */ ListBase views; /* RenderView */ /* allowing live updates: */ volatile rcti renrect; volatile RenderLayer *renlay; - + /* optional saved endresult on disk */ int do_exr_tile; - + /* for render results in Image, verify validity for sequences */ int framenr; diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 81a0449d5b7..838f7031d14 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -66,7 +66,7 @@ typedef struct ShadeResult { /* only here for quick copy */ struct ShadeInputCopy { - + struct Material *mat; struct VlakRen *vlr; struct StrandRen *strand; @@ -98,7 +98,7 @@ typedef struct ShadeInputCol { typedef struct ShadeInput { /* copy from face, also to extract tria from quad */ /* note it mirrors a struct above for quick copy */ - + struct Material *mat; struct VlakRen *vlr; struct StrandRen *strand; @@ -114,26 +114,26 @@ typedef struct ShadeInput { float vn[3], vno[3]; /* actual render normal, and a copy to restore it */ float n1[3], n2[3], n3[3]; /* vertex normals, corrected */ int mode, mode2; /* base material mode (OR-ed result of entire node tree) */ - + /* internal face coordinates */ float u, v, dx_u, dx_v, dy_u, dy_v; float co[3], view[3], camera_co[3]; - + /* copy from material, keep synced so we can do memcopy */ /* current size: 23*4 */ float r, g, b; float specr, specg, specb; float mirr, mirg, mirb; float ambr, ambb, ambg; - + float amb, emit, ang, spectra, ray_mirror; float alpha, refl, spec, zoffs, add; float translucency; /* end direct copy from material */ - + /* individual copies: */ int har; /* hardness */ - + /* texture coordinates */ float lo[3], gl[3], ref[3], orn[3], winco[3], vcol[4]; float refcol[4], displace[3]; @@ -144,7 +144,7 @@ typedef struct ShadeInput { ShadeInputUV uv[8]; /* 8 = MAX_MTFACE */ ShadeInputCol col[8]; /* 8 = MAX_MCOL */ int totuv, totcol, actuv, actcol; - + /* dx/dy OSA coordinates */ float dxco[3], dyco[3]; float dxlo[3], dylo[3], dxgl[3], dygl[3]; @@ -154,18 +154,18 @@ typedef struct ShadeInput { float dxwin[3], dywin[3]; float dxrefract[3], dyrefract[3]; float dxstrand, dystrand; - + /* AO is a pre-process now */ float ao[3], indirect[3], env[3]; - + 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 */ int volume_depth; /* number of intersections through volumes */ - + /* for strand shading, normal at the surface */ float surfnor[3], surfdist; @@ -175,7 +175,7 @@ typedef struct ShadeInput { bool use_world_space_shading; short thread, sample; /* sample: ShadeSample array index */ short nodes; /* indicate node shading, temp hack to prevent recursion */ - + unsigned int lay; int layflag, passflag, combinedflag; short object_pass_index; @@ -185,7 +185,7 @@ typedef struct ShadeInput { #ifdef RE_RAYCOUNTER RayCounter raycounter; #endif - + } ShadeInput; typedef struct BakeImBufuserData { |