diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 16:51:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 16:51:47 +0400 |
commit | 6701933f5ce4598d2fc98bd27a5b8a4e58ca06e2 (patch) | |
tree | 86eb9432c2350152aa7d829bb7adf41cf9fd2bde /source/blender/render | |
parent | 96b024333edf31fb02881b1c2fbacaf556a49439 (diff) |
style cleanup
Diffstat (limited to 'source/blender/render')
7 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 11895eae441..f7f1efd63dc 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -2483,7 +2483,7 @@ static void init_render_mball(Render *re, ObjectRen *obr) ver->n[1]= imat[1][0]*xn+imat[1][1]*yn+imat[1][2]*zn; ver->n[2]= imat[2][0]*xn+imat[2][1]*yn+imat[2][2]*zn; normalize_v3(ver->n); - //if(ob->transflag & OB_NEG_SCALE) negate_v3(ver->n); + //if (ob->transflag & OB_NEG_SCALE) negate_v3(ver->n); if (need_orco) { ver->orco= orco; @@ -5514,7 +5514,7 @@ static int load_fluidsimspeedvectors(Render *re, ObjectInstanceRen *obi, float * // set both to the same value speed[0]= speed[2]= zco[0]; speed[1]= speed[3]= zco[1]; - //if(a<20) fprintf(stderr,"speed %d %f,%f | camco %f,%f,%f | hoco %f,%f,%f,%f\n", a, speed[0], speed[1], camco[0],camco[1], camco[2], hoco[0],hoco[1], hoco[2],hoco[3]); // NT DEBUG + //if (a < 20) fprintf(stderr,"speed %d %f,%f | camco %f,%f,%f | hoco %f,%f,%f,%f\n", a, speed[0], speed[1], camco[0],camco[1], camco[2], hoco[0],hoco[1], hoco[2],hoco[3]); // NT DEBUG } return 1; diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 1222dd121a7..0c735c18c57 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -102,7 +102,7 @@ static RayObject* RE_rayobject_create(Render *re, int type, int size) if (type == R_RAYSTRUCTURE_AUTO) { //TODO - //if(detect_simd()) + //if (detect_simd()) #ifdef __SSE__ type = BLI_cpu_support_sse2()? R_RAYSTRUCTURE_SIMD_SVBVH: R_RAYSTRUCTURE_VBVH; #else diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 453bb0aeeb6..fedbce89058 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -1647,7 +1647,7 @@ static void texco_mapping(ShadeInput* shi, Tex* tex, MTex* mtex, float* co, floa } } if (tex->extend == TEX_REPEAT && (tex->flag & TEX_REPEAT_YMIR)) { - if (tex->texfilter == TXF_BOX) + if (tex->texfilter == TXF_BOX) texvec[1] -= floorf(texvec[1]); else if (texvec[1] < 0.f || texvec[1] > 1.f) { const float ty = 0.5f*texvec[1]; diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index d238087cfb1..6a0c8e3526f 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -1189,7 +1189,7 @@ HaloRen *RE_inithalo_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Mater har->add = 255.0f*add; } /* now what on earth is this good for?? */ - //if(mtex->texco & 16) { + //if (mtex->texco & 16) { // har->alfa= tin; //} } diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 742d28d89b7..7b17c782590 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -114,7 +114,7 @@ static int sizeoflampbuf(ShadBuf *shb) cp= shb->cbuf; num= (shb->size*shb->size)/256; - while(num--) count+= *(cp++); + while (num--) count+= *(cp++); return 256*count; } @@ -446,7 +446,7 @@ static void compress_deepshadowbuf(Render *re, ShadBuf *shb, APixstr *apixbuf, A /* merge buffers */ dsb= shsample->deepbuf[a]; - while(1) { + while (1) { minz= 0; found= 0; @@ -829,7 +829,7 @@ static void *do_shadow_thread(void *re_v) lar->thread_ready= 1; BLI_unlock_thread(LOCK_CUSTOM1); } - } while(lar && !re->test_break(re->tbh)); + } while (lar && !re->test_break(re->tbh)); return NULL; } @@ -894,7 +894,7 @@ void threaded_makeshadowbufs(Render *re) if (lar->shb && !lar->thread_ready) break; BLI_unlock_thread(LOCK_CUSTOM1); - } while(lar); + } while (lar); BLI_end_threads(&threads); @@ -1371,7 +1371,7 @@ float shadow_halo(LampRen *lar, const float p1[3], const float p2[3]) /* printf("start %x %x \n", (int)(0x7FFFFFFF*zf1), (int)(0x7FFFFFFF*zf2)); */ - while(1) { + while (1) { labdao= labda; if (labdax==labday) { @@ -1613,7 +1613,7 @@ static int isb_bsp_insert(ISBBranch *root, MemArena *memarena, ISBSample *sample root->totsamp++; /* going over branches until last one found */ - while(bspn->left) { + while (bspn->left) { if (zco[bspn->index] <= bspn->divider[bspn->index]) bspn= bspn->left; else @@ -2244,7 +2244,7 @@ static void isb_make_buffer(RenderPart *pa, LampRen *lar) PixStr *ps= (PixStr *)(*rd); int mask= (1<<sample); - while(ps) { + while (ps) { if (ps->mask & mask) break; ps= ps->next; @@ -2315,7 +2315,7 @@ static void isb_make_buffer(RenderPart *pa, LampRen *lar) if (*rd) { PixStr *ps= (PixStr *)(*rd); - while(ps) { + while (ps) { if (ps->shadfac) isb_add_shadfac(isbsa, isbdata->memarena, ps->obi, ps->facenr, ps->shadfac, count_mask(ps->mask)); ps= ps->next; @@ -2382,7 +2382,7 @@ static int isb_add_samples_transp(RenderPart *pa, ISBBranch *root, MemArena *mem int x= xcos[xi]; samp1= *(samp + y*pa->rectx + x); - while(samp1) { + while (samp1) { bsp_err |= isb_bsp_insert(root, memarena, (ISBSample *)samp1); samp1= samp1->next; } @@ -2572,7 +2572,7 @@ float ISB_getshadow(ShadeInput *shi, ShadBuf *shb) int obi= shi->obi - R.objectinstance; ISBShadfacA *isbsa= *(isbdata->shadfaca + sindex); - while(isbsa) { + while (isbsa) { if (isbsa->facenr==shi->facenr+1 && isbsa->obi==obi) return isbsa->shadfac>=1.0f?0.0f:1.0f - isbsa->shadfac; isbsa= isbsa->next; diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 7f8b0ac80ed..dcc3bee7730 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -1152,7 +1152,7 @@ float lamp_get_visibility(LampRen *lar, const float co[3], float lv[3], float *d /* area type has no quad or sphere option */ if (lar->type==LA_AREA) { /* area is single sided */ - //if(dot_v3v3(lv, lar->vec) > 0.0f) + //if (dot_v3v3(lv, lar->vec) > 0.0f) // visifac= 1.0f; //else // visifac= 0.0f; diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c index dd1bddc5020..b6eccc3e10f 100644 --- a/source/blender/render/intern/source/sss.c +++ b/source/blender/render/intern/source/sss.c @@ -285,12 +285,12 @@ static void build_Rd_table(ScatterSettings *ss) for (i= 0; i < size; i++) { r= i*(RD_TABLE_RANGE/RD_TABLE_SIZE); - /*if(r < ss->invsigma_t_*ss->invsigma_t_) + /*if (r < ss->invsigma_t_*ss->invsigma_t_) r= ss->invsigma_t_*ss->invsigma_t_;*/ ss->tableRd[i]= Rd(ss, sqrt(r)); r= i*(RD_TABLE_RANGE_2/RD_TABLE_SIZE); - /*if(r < ss->invsigma_t_) + /*if (r < ss->invsigma_t_) r= ss->invsigma_t_;*/ ss->tableRd2[i]= Rd(ss, r); } |