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/intern/include | |
parent | 009c38df5303f0a32eed2962650b89ebd6ae2e46 (diff) |
Cleanup: trailing space
Remove from blender/nodes, collada, blenfont & render.
Diffstat (limited to 'source/blender/render/intern/include')
15 files changed, 70 insertions, 70 deletions
diff --git a/source/blender/render/intern/include/envmap.h b/source/blender/render/intern/include/envmap.h index 58bde7d2322..c66427ae788 100644 --- a/source/blender/render/intern/include/envmap.h +++ b/source/blender/render/intern/include/envmap.h @@ -34,7 +34,7 @@ #ifndef __ENVMAP_H__ -#define __ENVMAP_H__ +#define __ENVMAP_H__ /** * Make environment maps for all objects in the scene that have an diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h index 87e2d2519d5..0f952baf257 100644 --- a/source/blender/render/intern/include/initrender.h +++ b/source/blender/render/intern/include/initrender.h @@ -31,7 +31,7 @@ #ifndef __INITRENDER_H__ -#define __INITRENDER_H__ +#define __INITRENDER_H__ /* Functions */ diff --git a/source/blender/render/intern/include/pixelblending.h b/source/blender/render/intern/include/pixelblending.h index fd647f96afe..022510c7132 100644 --- a/source/blender/render/intern/include/pixelblending.h +++ b/source/blender/render/intern/include/pixelblending.h @@ -29,7 +29,7 @@ #ifndef __PIXELBLENDING_H__ -#define __PIXELBLENDING_H__ +#define __PIXELBLENDING_H__ /** diff --git a/source/blender/render/intern/include/pixelshading.h b/source/blender/render/intern/include/pixelshading.h index 98da7eb037b..0e630eda475 100644 --- a/source/blender/render/intern/include/pixelshading.h +++ b/source/blender/render/intern/include/pixelshading.h @@ -44,7 +44,7 @@ * mask is pixel coverage in bits * \return pointer to the object */ -int shadeHaloFloat(HaloRen *har, +int shadeHaloFloat(HaloRen *har, float *col, int zz, float dist, float xn, float yn, short flarec); diff --git a/source/blender/render/intern/include/pointdensity.h b/source/blender/render/intern/include/pointdensity.h index 1d1e808e8d3..eadf714c1ba 100644 --- a/source/blender/render/intern/include/pointdensity.h +++ b/source/blender/render/intern/include/pointdensity.h @@ -31,7 +31,7 @@ #ifndef __POINTDENSITY_H__ -#define __POINTDENSITY_H__ +#define __POINTDENSITY_H__ /** * Make point density kd-trees for all point density textures in the scene diff --git a/source/blender/render/intern/include/raycounter.h b/source/blender/render/intern/include/raycounter.h index d9ae210048d..e16c6e13c7e 100644 --- a/source/blender/render/intern/include/raycounter.h +++ b/source/blender/render/intern/include/raycounter.h @@ -64,7 +64,7 @@ extern RayCounter re_rc_counter[]; #define RE_RC_INFO(rc) #define RE_RC_MERGE(dest,src) #define RE_RC_COUNT(var) - + #endif #ifdef __cplusplus diff --git a/source/blender/render/intern/include/rayintersection.h b/source/blender/render/intern/include/rayintersection.h index ae1db30575a..a303301ad3b 100644 --- a/source/blender/render/intern/include/rayintersection.h +++ b/source/blender/render/intern/include/rayintersection.h @@ -69,7 +69,7 @@ typedef struct Isect { /* for envmap and incremental view update renders */ float origstart[3]; float origdir[3]; - + /* precomputed values to accelerate bounding box intersection */ int bv_index[6]; float idot_axis[3]; @@ -84,12 +84,12 @@ typedef struct Isect { /* hit information */ float u, v; int isect; /* which half of quad */ - + struct { void *ob; void *face; } hit, orig; - + /* last hit optimization */ struct RayObject *last_hit; @@ -98,7 +98,7 @@ typedef struct Isect { RayTraceHint *hint, *hit_hint; #endif RayHint *hint; - + /* ray counter */ #ifdef RE_RAYCOUNTER RayCounter *raycounter; diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 45206f21ae4..4753d65597a 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -72,7 +72,7 @@ typedef struct SampleTables { float centLut[16]; float *fmask1[9], *fmask2[9]; char cmask[256], *centmask; - + } SampleTables; typedef struct QMCSampler { @@ -91,10 +91,10 @@ typedef struct QMCSampler { /* this is handed over to threaded hiding/passes/shading engine */ typedef struct RenderPart { struct RenderPart *next, *prev; - + RenderResult *result; /* result of part rendering */ ListBase fullresult; /* optional full sample buffers */ - + int *recto; /* object table for objects */ int *rectp; /* polygon index table */ int *rectz; /* zbuffer */ @@ -111,7 +111,7 @@ typedef struct RenderPart { short crop, status; /* crop is amount of pixels we crop, for filter */ short sample; /* sample can be used by zbuffers */ short thread; /* thread id */ - + char *clipflag; /* clipflags for part zbuffering */ } RenderPart; @@ -127,13 +127,13 @@ struct Render { struct Render *next, *prev; char name[RE_MAXNAME]; int slot; - + /* state settings */ short flag, osa, ok, result_ok; - + /* due to performance issues, getting initialized from color management settings once on Render initialization */ bool scene_color_manage; - + /* result of rendering */ RenderResult *result; /* if render with single-layer option, other rendered layers are stored here */ @@ -144,7 +144,7 @@ struct Render { * write lock, all external code must use a read lock. internal code is assumed * to not conflict with writes, so no lock used for that */ ThreadRWMutex resultmutex; - + /* window size, display rect, viewplane */ int winx, winy; /* buffer width and height with percentage applied * without border & crop. convert to long before multiplying together to avoid overflow. */ @@ -152,40 +152,40 @@ struct Render { rctf viewplane; /* mapped on winx winy */ float viewdx, viewdy; /* size of 1 pixel */ float clipcrop; /* 2 pixel boundary to prevent clip when filter used */ - + /* final picture width and height (within disprect) */ int rectx, recty; - - /* real maximum size of parts after correction for minimum + + /* real maximum size of parts after correction for minimum * partx*xparts can be larger than rectx, in that case last part is smaller */ int partx, party; - + /* values for viewing */ float ycor; /* (scene->xasp / scene->yasp), multiplied with 'winy' */ - + float panophi, panosi, panoco, panodxp, panodxv; - + /* Matrices */ float grvec[3]; /* for world */ float imat[3][3]; /* copy of viewinv */ float viewmat[4][4], viewinv[4][4]; float viewmat_orig[4][4]; /* for incremental render */ float winmat[4][4]; - + /* clippping */ float clipsta; float clipend; - + /* samples */ SampleTables *samples; float jit[32][2]; float mblur_jit[32][2]; ListBase *qmcsamplers; int num_qmc_samplers; - + /* shadow counter, detect shadow-reuse for shaders */ int shadowsamplenr[BLENDER_MAX_THREADS]; - + /* main, scene, and its full copy of renderdata and world */ struct Main *main; Scene *scene; @@ -193,13 +193,13 @@ struct Render { World wrld; struct Object *camera_override; unsigned int lay, layer_override; - + ThreadRWMutex partsmutex; ListBase parts; - + /* render engine */ struct RenderEngine *engine; - + /* octree tables and variables for raytrace */ struct RayObject *raytree; struct RayFace *rayfaces; @@ -209,17 +209,17 @@ struct Render { /* occlusion tree */ void *occlusiontree; ListBase strandsurface; - + /* use this instead of R.r.cfra */ float mblur_offs, field_offs; - + /* render database */ int totvlak, totvert, tothalo, totstrand, totlamp; struct HaloRen **sortedhalos; ListBase lights; /* GroupObject pointers */ ListBase lampren; /* storage, for free */ - + ListBase objecttable; struct ObjectInstanceRen *objectinstance; @@ -227,7 +227,7 @@ struct Render { int totinstance; struct Image *bakebuf; - + struct GHash *orco_hash; struct GHash *sss_hash; @@ -249,7 +249,7 @@ struct Render { * example dynamic TFaces to go in the VlakRen structure. */ struct MemArena *memArena; - + /* callbacks */ void (*display_init)(void *handle, RenderResult *rr); void *dih; @@ -259,17 +259,17 @@ struct Render { void *duh; void (*current_scene_update)(void *handle, struct Scene *scene); void *suh; - + void (*stats_draw)(void *handle, RenderStats *ri); void *sdh; void (*progress)(void *handle, float i); void *prh; - + void (*draw_lock)(void *handle, int i); void *dlh; int (*test_break)(void *handle); void *tbh; - + RenderStats i; struct ReportList *reports; @@ -289,7 +289,7 @@ typedef struct DeepSample { int z; float v; } DeepSample; - + typedef struct ShadSampleBuf { struct ShadSampleBuf *next, *prev; intptr_t *zbuf; @@ -309,7 +309,7 @@ typedef struct ShadBuf { int co[3]; int size, bias; ListBase buffers; - + /* irregular shadowbufer, result stored per thread */ struct ISBData *isb_result[BLENDER_MAX_THREADS]; } ShadBuf; @@ -345,7 +345,7 @@ typedef struct ObjectRen { struct RayFace *rayfaces; struct VlakPrimitive *rayprimitives; struct ObjectInstanceRen *rayobi; - + } ObjectRen; typedef struct ObjectInstanceRen { @@ -365,12 +365,12 @@ typedef struct ObjectInstanceRen { float dupliorco[3], dupliuv[2]; float (*duplitexmat)[4]; - + struct VolumePrecache *volume_precache; - + float *vectors; /* (RE_WINSPEED_ELEMS * VertRen.index) */ int totvector; - + /* used on makeraytree */ struct RayObject *raytree; int transform_primitives; @@ -485,9 +485,9 @@ typedef struct StrandBuffer { int overrideuv; int flag, maxdepth; float adaptcos, minwidth, widthfade; - + float maxwidth; /* for cliptest of strands in blender unit */ - + float winmat[4][4]; int winx, winy; } StrandBuffer; @@ -559,7 +559,7 @@ typedef struct LampShadowSample { typedef struct LampRen { struct LampRen *next, *prev; - + float xs, ys, dist; float co[3]; short type; @@ -572,7 +572,7 @@ typedef struct LampRen { float vec[3]; float xsp, ysp, distkw, inpr; float halokw, halo; - + short falloff_type; float ld1, ld2; float coeff_const, coeff_lin, coeff_quad; @@ -601,7 +601,7 @@ typedef struct LampRen { float bias; /* Compression threshold for deep shadow maps */ float compressthresh; - + short ray_samp, ray_sampy, ray_sampz, ray_samp_method, ray_samp_type, area_shape, ray_totsamp; short xold[BLENDER_MAX_THREADS], yold[BLENDER_MAX_THREADS]; /* last jitter table for area lights */ float area_size, area_sizey, area_sizez; @@ -609,10 +609,10 @@ typedef struct LampRen { /* sun/sky */ struct SunSky *sunsky; - + struct ShadBuf *shb; float *jitter; - + float imat[3][3]; float spottexfac; float sh_invcampos[3], sh_zfac; /* sh_= spothalo */ @@ -621,13 +621,13 @@ typedef struct LampRen { float mat[3][3]; /* 3x3 part from lampmat x viewmat */ float area[8][3], areasize; - + /* passes & node shader support: all shadow info for a pixel */ LampShadowSample *shadsamp; - + /* ray optim */ struct RayObject *last_hit[BLENDER_MAX_THREADS]; - + struct MTex *mtex[MAX_MTEX]; /* threading */ @@ -658,9 +658,9 @@ typedef struct LampRen { #define R_FULL_OSA 8 #define R_FACE_SPLIT 16 /* Tells render to divide face other way. */ -#define R_DIVIDE_24 32 +#define R_DIVIDE_24 32 /* vertex normals are tangent or view-corrected vector, for hair strands */ -#define R_TANGENT 64 +#define R_TANGENT 64 #define R_TRACEBLE 128 /* vlakren->freestyle_edge_mark */ diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h index f4c4a50ac27..aa3efca9e5b 100644 --- a/source/blender/render/intern/include/rendercore.h +++ b/source/blender/render/intern/include/rendercore.h @@ -26,7 +26,7 @@ */ #ifndef __RENDERCORE_H__ -#define __RENDERCORE_H__ +#define __RENDERCORE_H__ /** \file blender/render/intern/include/rendercore.h * \ingroup render diff --git a/source/blender/render/intern/include/shading.h b/source/blender/render/intern/include/shading.h index 3ef6e9d7476..e306c3c075c 100644 --- a/source/blender/render/intern/include/shading.h +++ b/source/blender/render/intern/include/shading.h @@ -44,9 +44,9 @@ struct Isect; /* needed to calculate shadow and AO for an entire pixel */ typedef struct ShadeSample { int tot; /* amount of shi in use, can be 1 for not FULL_OSA */ - + RenderLayer *rlpp[RE_MAX_OSA]; /* fast lookup from sample to renderlayer (fullsample buf) */ - + /* could be malloced once */ ShadeInput shi[RE_MAX_OSA]; ShadeResult shr[RE_MAX_OSA]; diff --git a/source/blender/render/intern/include/strand.h b/source/blender/render/intern/include/strand.h index 5687ef3c837..f4e22c78b42 100644 --- a/source/blender/render/intern/include/strand.h +++ b/source/blender/render/intern/include/strand.h @@ -26,7 +26,7 @@ #ifndef __STRAND_H__ -#define __STRAND_H__ +#define __STRAND_H__ struct StrandVert; struct StrandRen; diff --git a/source/blender/render/intern/include/sunsky.h b/source/blender/render/intern/include/sunsky.h index 53151ca17ac..c608f9fc48c 100644 --- a/source/blender/render/intern/include/sunsky.h +++ b/source/blender/render/intern/include/sunsky.h @@ -51,7 +51,7 @@ typedef struct SunSky { float backscattered_light; float skyblendfac; float sky_exposure; - + float atm_HGg; float atm_SunIntensity; diff --git a/source/blender/render/intern/include/texture_ocean.h b/source/blender/render/intern/include/texture_ocean.h index 4a71aff930a..6d7bc6fe7b0 100644 --- a/source/blender/render/intern/include/texture_ocean.h +++ b/source/blender/render/intern/include/texture_ocean.h @@ -1,4 +1,4 @@ -/* +/* * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or diff --git a/source/blender/render/intern/include/voxeldata.h b/source/blender/render/intern/include/voxeldata.h index dd2262e0357..041ca78a799 100644 --- a/source/blender/render/intern/include/voxeldata.h +++ b/source/blender/render/intern/include/voxeldata.h @@ -30,7 +30,7 @@ */ #ifndef __VOXELDATA_H__ -#define __VOXELDATA_H__ +#define __VOXELDATA_H__ struct Render; struct TexResult; diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h index eb1af7ad89c..95c78e6d614 100644 --- a/source/blender/render/intern/include/zbuf.h +++ b/source/blender/render/intern/include/zbuf.h @@ -87,13 +87,13 @@ typedef struct APixstrMain { /* span fill in method, is also used to localize data for zbuffering */ typedef struct ZSpan { int rectx, recty; /* range for clipping */ - + int miny1, maxy1, miny2, maxy2; /* actual filled in range */ const float *minp1, *maxp1, *minp2, *maxp2; /* vertex pointers detect min/max range in */ float *span1, *span2; - + float zmulx, zmuly, zofsx, zofsy; /* transform from hoco to zbuf co */ - + int *rectz, *arectz; /* zbuffers, arectz is for transparent */ int *rectz1; /* secondary z buffer for shadowbuffer (2nd closest z) */ int *rectp; /* polygon index buffer */ @@ -102,7 +102,7 @@ typedef struct ZSpan { APixstr *apixbuf, *curpstr; /* apixbuf for transparent */ APixstrand *curpstrand; /* same for strands */ struct ListBase *apsmbase; - + int polygon_offset; /* offset in Z */ float shad_alpha; /* copy from material, used by irregular shadbuf */ int mask, apsmcounter; /* in use by apixbuf */ @@ -112,10 +112,10 @@ typedef struct ZSpan { void *sss_handle; /* used by sss */ void (*sss_func)(void *, int, int, int, int, int); - + void (*zbuffunc)(struct ZSpan *, int, int, const float *, const float *, const float *, const float *); void (*zbuflinefunc)(struct ZSpan *, int, int, const float *, const float *); - + } ZSpan; /* exported to shadbuf.c */ |