diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-12 12:16:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-12 12:16:22 +0300 |
| commit | e387a4e768ea8328e2636eade5ed6a0be747f7a2 (patch) | |
| tree | 6a01e91a73990431bc4530f1857a89ad50ccc881 /source/blender | |
| parent | a2929edf28e8638eff72ee57ed58e79bbab4b283 (diff) | |
Cleanup: style, duplicate header
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 1 | ||||
| -rw-r--r-- | source/blender/draw/engines/basic/basic_engine.c | 5 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_lightprobes.c | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 2b2fc2fc767..8299d785cfc 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -102,7 +102,6 @@ #include "DEG_depsgraph_query.h" #include "RE_engine.h" -#include "RE_engine.h" #include "engines/eevee/eevee_lightcache.h" diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c index 4348f2182a4..5a315cde2b5 100644 --- a/source/blender/draw/engines/basic/basic_engine.c +++ b/source/blender/draw/engines/basic/basic_engine.c @@ -150,7 +150,7 @@ static void basic_cache_populate(void *vedata, Object *ob) for (ParticleSystem *psys = ob->particlesystem.first; psys != NULL; psys = psys->next) - { + { if (!psys_check_enabled(ob, psys, false)) { continue; } @@ -158,8 +158,7 @@ static void basic_cache_populate(void *vedata, Object *ob) continue; } ParticleSettings *part = psys->part; - const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as - : part->draw_as; + const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as; if (draw_as == PART_DRAW_PATH) { struct Gwn_Batch *hairs = DRW_cache_particles_get_hair(ob, psys, NULL); DRW_shgroup_call_add(stl->g_data->depth_shgrp, hairs, NULL); diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index b58e389b558..1b341aced07 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -313,7 +313,8 @@ void EEVEE_lightprobes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) } if ((scene_eval->eevee.light_cache == NULL) && - (sldata->fallback_lightcache == NULL)) { + (sldata->fallback_lightcache == NULL)) + { #if defined(IRRADIANCE_SH_L2) int grid_res = 4; #elif defined(IRRADIANCE_CUBEMAP) @@ -860,7 +861,7 @@ void EEVEE_lightprobes_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved /** \name Rendering * \{ */ -typedef struct EEVEE_BakeRenderData{ +typedef struct EEVEE_BakeRenderData { EEVEE_Data *vedata; EEVEE_ViewLayerData *sldata; struct GPUFrameBuffer **face_fb; /* should contain 6 framebuffer */ |