Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-11 08:43:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-11 08:43:20 +0300
commit83a83a3d4b730dc98888ab6137738a5b6659bf96 (patch)
treeb43c623494e916262f16512567566c42794acea1 /source/blender/draw/intern/draw_cache_impl_particles.c
parent8c96cb55c33b4ae2d82b6b94472da8bd08b0fb34 (diff)
Cleanup: whitespace, duplicate includes
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_particles.c')
-rw-r--r--source/blender/draw/intern/draw_cache_impl_particles.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c
index 0bf2ea4f26c..100b28057f4 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -191,7 +191,8 @@ static void ensure_seg_pt_count(ParticleSystem *psys, ParticleBatchCache *cache)
PTCacheEdit *edit = PE_get_current_from_psys(psys);
if (edit != NULL && edit->pathcache != NULL) {
count_cache_segment_keys(edit->pathcache, psys->totpart, cache);
- } else {
+ }
+ else {
if (psys->pathcache &&
(!psys->childcache || (psys->part->draw & PART_DRAW_PARENT)))
{
@@ -373,11 +374,11 @@ static int particle_batch_cache_fill_segments(
if (psmd != NULL) {
for (int k = 0; k < num_uv_layers; k++) {
- GWN_vertbuf_attr_set(
- cache->pos, uv_id[k], curr_point,
- (is_simple && is_child)
- ? (*r_parent_uvs)[psys->child[i].parent][k]
- : uv[k]);
+ GWN_vertbuf_attr_set(
+ cache->pos, uv_id[k], curr_point,
+ (is_simple && is_child) ?
+ (*r_parent_uvs)[psys->child[i].parent][k] :
+ uv[k]);
}
if (!is_simple) {
MEM_freeN(uv);