Cleanup: style, duplicate header
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 09:16:22 +0000 (11:16 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 09:16:22 +0000 (11:16 +0200)
source/blender/blenkernel/intern/scene.c
source/blender/draw/engines/basic/basic_engine.c
source/blender/draw/engines/eevee/eevee_lightprobes.c

index 2b2fc2fc767737c1a6edd88da120f377ec84807a..8299d785cfcce207c3fcaf2054ea76a76d562aa8 100644 (file)
 #include "DEG_depsgraph_debug.h"
 #include "DEG_depsgraph_query.h"
 
-#include "RE_engine.h"
 #include "RE_engine.h"
 
 #include "engines/eevee/eevee_lightcache.h"
index 4348f2182a4a57ca80eaf61aec382b6e740c1396..5a315cde2b50f593c9658aba760fd40da4f35d27 100644 (file)
@@ -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);
index b58e389b5585415950ab2107544fb84582739c1c..1b341aced072000f176465caf70be8b69a3e1d10 100644 (file)
@@ -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 */