diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-28 18:19:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-28 18:19:05 +0400 |
commit | 857df8065face58eff5556953cdf2dd72e09f2b6 (patch) | |
tree | 51fdb13476e00b7ec1a7575d9c0293de2b17bd7d /source/blender/render | |
parent | ddf39a87aa704240a0cb0cac584893ba34700e5d (diff) |
style cleanup
Diffstat (limited to 'source/blender/render')
8 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_instance.cpp b/source/blender/render/intern/raytrace/rayobject_instance.cpp index f9ed012b117..01e592cba0c 100644 --- a/source/blender/render/intern/raytrace/rayobject_instance.cpp +++ b/source/blender/render/intern/raytrace/rayobject_instance.cpp @@ -173,13 +173,13 @@ static int RE_rayobject_instance_intersect(RayObject *o, Isect *isec) static void RE_rayobject_instance_free(RayObject *o) { - InstanceRayObject *obj = (InstanceRayObject*)o; + InstanceRayObject *obj = (InstanceRayObject *)o; MEM_freeN(obj); } static float RE_rayobject_instance_cost(RayObject *o) { - InstanceRayObject *obj = (InstanceRayObject*)o; + InstanceRayObject *obj = (InstanceRayObject *)o; return RE_rayobject_cost(obj->target) + RE_COST_INSTANCE; } diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index fc1a9b2f755..76d67765424 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -161,7 +161,7 @@ static HaloRen *initstar(Render *re, ObjectRen *obr, const float vec[3], float h */ void RE_make_stars(Render *re, Scene *scenev3d, void (*initfunc)(void), - void (*vertexfunc)(float*), void (*termfunc)(void)) + void (*vertexfunc)(float *), void (*termfunc)(void)) { extern unsigned char hash[512]; ObjectRen *obr= NULL; diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index fb9eb59cbbf..bef5902588c 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -81,7 +81,7 @@ extern struct Render R; /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ static int test_break(void *data) { - Render *re = (Render*)data; + Render *re = (Render *)data; return re->test_break(re->tbh); } @@ -250,9 +250,9 @@ RayObject* makeraytree_object(Render *re, ObjectInstanceRen *obi) //Create Ray cast accelaration structure raytree = rayobject_create( re, re->r.raytrace_structure, faces ); if ( (re->r.raytrace_options & R_RAYTRACE_USE_LOCAL_COORDS) ) - vlakprimitive = obr->rayprimitives = (VlakPrimitive*)MEM_callocN(faces*sizeof(VlakPrimitive), "ObjectRen primitives"); + vlakprimitive = obr->rayprimitives = (VlakPrimitive *)MEM_callocN(faces * sizeof(VlakPrimitive), "ObjectRen primitives"); else - face = obr->rayfaces = (RayFace*)MEM_callocN(faces*sizeof(RayFace), "ObjectRen faces"); + face = obr->rayfaces = (RayFace *)MEM_callocN(faces * sizeof(RayFace), "ObjectRen faces"); obr->rayobi = obi; @@ -345,10 +345,10 @@ static void makeraytree_single(Render *re) raytree = re->raytree = rayobject_create( re, re->r.raytrace_structure, faces+special ); if ( (re->r.raytrace_options & R_RAYTRACE_USE_LOCAL_COORDS) ) { - vlakprimitive = re->rayprimitives = (VlakPrimitive*)MEM_callocN(faces*sizeof(VlakPrimitive), "Raytrace vlak-primitives"); + vlakprimitive = re->rayprimitives = (VlakPrimitive *)MEM_callocN(faces * sizeof(VlakPrimitive), "Raytrace vlak-primitives"); } else { - face = re->rayfaces = (RayFace*)MEM_callocN(faces*sizeof(RayFace), "Render ray faces"); + face = re->rayfaces = (RayFace *)MEM_callocN(faces * sizeof(RayFace), "Render ray faces"); } for (obi=re->instancetable.first; obi; obi=obi->next) @@ -496,8 +496,8 @@ static void shade_ray_set_derivative(ShadeInput *shi) void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr) { - ObjectInstanceRen *obi= (ObjectInstanceRen*)is->hit.ob; - VlakRen *vlr= (VlakRen*)is->hit.face; + ObjectInstanceRen *obi = (ObjectInstanceRen *)is->hit.ob; + VlakRen *vlr = (VlakRen *)is->hit.face; /* set up view vector */ copy_v3_v3(shi->view, is->dir); diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index bd0061c0e68..9f171ba71db 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -1172,7 +1172,7 @@ typedef struct ZbufSolidData { static void make_pixelstructs(RenderPart *pa, ZSpan *zspan, int sample, void *data) { - ZbufSolidData *sdata= (ZbufSolidData*)data; + ZbufSolidData *sdata = (ZbufSolidData *)data; ListBase *lb= sdata->psmlist; intptr_t *rd= pa->rectdaps; int *ro= zspan->recto; @@ -1740,7 +1740,7 @@ void zbufshade_sss_tile(RenderPart *pa) #if 0 if (rs) { /* for each sample in this pixel, shade it */ - for (ps=(PixStr*)*rs; ps; ps=ps->next) { + for (ps = (PixStr *)(*rs); ps; ps=ps->next) { ObjectInstanceRen *obi= &re->objectinstance[ps->obi]; ObjectRen *obr= obi->obr; vlr= RE_findOrAddVlak(obr, (ps->facenr-1) & RE_QUAD_MASK); @@ -2461,8 +2461,8 @@ static void do_bake_shade(void *handle, int x, int y, float u, float v) /* if hit, we shade from the new point, otherwise from point one starting face */ if (hit) { - obi= (ObjectInstanceRen*)minisec.hit.ob; - vlr= (VlakRen*)minisec.hit.face; + obi = (ObjectInstanceRen *)minisec.hit.ob; + vlr = (VlakRen *)minisec.hit.face; quad= (minisec.isect == 2); copy_v3_v3(shi->co, minco); diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index e189d8bdaea..a4e5b9eb7a2 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -370,7 +370,7 @@ RadFace **RE_vlakren_get_radface(ObjectRen *obr, VlakRen *vlak, int verify) radface= obr->vlaknodes[nr].radface; if (radface==NULL) { if (verify) - radface= obr->vlaknodes[nr].radface= MEM_callocN(256*RE_RADFACE_ELEMS*sizeof(void*), "radface table"); + radface = obr->vlaknodes[nr].radface= MEM_callocN(256 * RE_RADFACE_ELEMS * sizeof(void *), "radface table"); else return NULL; } @@ -888,9 +888,9 @@ HaloRen *RE_findOrAddHalo(ObjectRen *obr, int nr) // TABLEINITSIZE, obr->blohalen+TABLEINITSIZE ); temp=obr->bloha; - obr->bloha=(HaloRen**)MEM_callocN(sizeof(void*)*(obr->blohalen+TABLEINITSIZE), "Bloha"); - if (temp) memcpy(obr->bloha, temp, obr->blohalen*sizeof(void*)); - memset(&(obr->bloha[obr->blohalen]), 0, TABLEINITSIZE*sizeof(void*)); + obr->bloha = (HaloRen**)MEM_callocN(sizeof(void *) * (obr->blohalen + TABLEINITSIZE), "Bloha"); + if (temp) memcpy(obr->bloha, temp, obr->blohalen*sizeof(void *)); + memset(&(obr->bloha[obr->blohalen]), 0, TABLEINITSIZE * sizeof(void *)); obr->blohalen+=TABLEINITSIZE; /*Does this really need to be power of 2?*/ if (temp) MEM_freeN(temp); } diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 078c11a2061..87912f546e8 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -812,7 +812,7 @@ void makeshadowbuf(Render *re, LampRen *lar) static void *do_shadow_thread(void *re_v) { - Render *re= (Render*)re_v; + Render *re = (Render *)re_v; LampRen *lar; do { diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index 569bac29205..a37ffb1eb28 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -522,7 +522,7 @@ static APixstrand *addpsAstrand(ZSpan *zspan) static void do_strand_fillac(void *handle, int x, int y, float u, float v, float z) { - StrandPart *spart= (StrandPart*)handle; + StrandPart *spart= (StrandPart *)handle; StrandShadeCache *cache= spart->cache; StrandSegment *sseg= spart->segment; APixstrand *apn, *apnew; diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c index 549148f4e29..a9db197ed48 100644 --- a/source/blender/render/intern/source/volume_precache.c +++ b/source/blender/render/intern/source/volume_precache.c @@ -493,7 +493,7 @@ typedef struct VolPrecacheQueue { */ static void *vol_precache_part(void *data) { - VolPrecacheQueue *queue = (VolPrecacheQueue*)data; + VolPrecacheQueue *queue = (VolPrecacheQueue *)data; VolPrecachePart *pa; while ((pa = BLI_thread_queue_pop(queue->work))) { |