diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-29 19:55:37 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-29 19:55:37 +0400 |
commit | 1cffa7f339d51a62fba0b9d273b906a522c24b65 (patch) | |
tree | aef2990231df98ee4a761ff9feed8df6fde1a320 /source | |
parent | a7d4ea32f0207a1dc1a42787e93a52a124ca5852 (diff) |
style cleanup
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index eb19812876e..eb1c1a64e68 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2319,7 +2319,7 @@ void ui_draw_link_bezier(const rcti *rect) glEnableClientState(GL_VERTEX_ARRAY); glVertexPointer(2, GL_FLOAT, 0, coord_array); - glDrawArrays(GL_LINE_STRIP, 0, LINK_RESOL+1); + glDrawArrays(GL_LINE_STRIP, 0, LINK_RESOL + 1); glDisableClientState(GL_VERTEX_ARRAY); glDisable(GL_BLEND); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index b0b68b11ec9..0704e29925e 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -295,8 +295,8 @@ static void rna_ParticleSystem_co_hair(ParticleSystem *particlesystem, Object *o ParticleSettings *part = 0; ParticleData *pars = 0; ParticleCacheKey *cache = 0; - int totchild=0; - int path_nbr=0; + int totchild = 0; + int path_nbr = 0; int totpart; int max_k = 0; @@ -309,7 +309,7 @@ static void rna_ParticleSystem_co_hair(ParticleSystem *particlesystem, Object *o if (part == NULL || pars == NULL || !psys_check_enabled(object, particlesystem)) return; - if (part->ren_as==PART_DRAW_OB || part->ren_as==PART_DRAW_GR || part->ren_as==PART_DRAW_NOT) + if (part->ren_as == PART_DRAW_OB || part->ren_as == PART_DRAW_GR || part->ren_as == PART_DRAW_NOT) return; totchild = particlesystem->totchild * part->disp / 100; @@ -324,9 +324,9 @@ static void rna_ParticleSystem_co_hair(ParticleSystem *particlesystem, Object *o return; if (part->ren_as == PART_DRAW_PATH && particlesystem->pathcache) - path_nbr=(int)pow(2.0, part->draw_step); + path_nbr = (int)pow(2.0, part->draw_step); - if (particle_no<totpart) { + if (particle_no < totpart) { if (path_nbr) { cache = particlesystem->pathcache[particle_no]; @@ -337,7 +337,7 @@ static void rna_ParticleSystem_co_hair(ParticleSystem *particlesystem, Object *o else { if (path_nbr) { - cache = particlesystem->childcache[particle_no-totpart]; + cache = particlesystem->childcache[particle_no - totpart]; if (cache->steps < 0) max_k = 0; @@ -348,16 +348,16 @@ static void rna_ParticleSystem_co_hair(ParticleSystem *particlesystem, Object *o /*strands key loop data stored in cache + step->co*/ if (path_nbr) { - if (step>=0 && step<=path_nbr) { - if (step<=max_k) - copy_v3_v3(n_co, (cache+step)->co); + if (step >= 0 && step <= path_nbr) { + if (step <= max_k) + copy_v3_v3(n_co, (cache + step)->co); } } } static void rna_ParticleSystem_uv_on_emitter(ParticleSystem *particlesystem, ParticleSystemModifierData *modifier, ParticleData *particle, int particle_no, - float n_uv[2]) + float n_uv[2]) { ParticleSettings *part = 0; int totpart; @@ -368,7 +368,7 @@ static void rna_ParticleSystem_uv_on_emitter(ParticleSystem *particlesystem, Par if (particlesystem == NULL) return; - part=particlesystem->part; + part = particlesystem->part; totchild = particlesystem->totchild; @@ -383,7 +383,7 @@ static void rna_ParticleSystem_uv_on_emitter(ParticleSystem *particlesystem, Par /* 3. start creating renderable things */ /* setup per particle individual stuff */ - if (particle_no<totpart) { + if (particle_no < totpart) { /* get uvco & mcol */ num = particle->num_dmcache; @@ -407,7 +407,7 @@ static void rna_ParticleSystem_uv_on_emitter(ParticleSystem *particlesystem, Par } } else { - ChildParticle *cpa = particlesystem->child + particle_no-totpart; + ChildParticle *cpa = particlesystem->child + particle_no - totpart; num = cpa->num; |